Project

General

Profile

« Previous | Next » 

Revision 2028

Added by sgarg about 20 years ago

Bug 1301 - changes made for a repeatable add keyword button

View differences:

register-dataset.cgi
439 439
	    $$templateVars{'origNamelast10'} = $FORM::origNamelast10;
440 440
	    $$templateVars{'origRole10'} = $FORM::origRole10;
441 441
	    $$templateVars{'abstract'} = $FORM::abstract;
442
	    $$templateVars{'keyword0'} = $FORM::keyword0;
443
	    $$templateVars{'kwType0'} = $FORM::kwType0;
444
	    $$templateVars{'kwTh0'} = $FORM::kwTh0;
445
	    $$templateVars{'kwType1'} = $FORM::kwType1;
446
	    $$templateVars{'keyword1'} = $FORM::keyword1;
447
	    $$templateVars{'kwTh1'} = $FORM::kwTh1;
448
	    $$templateVars{'kwType2'} = $FORM::kwType2;
449
	    $$templateVars{'keyword2'} = $FORM::keyword2;
450
	    $$templateVars{'kwTh2'} = $FORM::kwTh2;
451
	    $$templateVars{'kwType3'} = $FORM::kwType3;
452
	    $$templateVars{'keyword3'} = $FORM::keyword3;
453
	    $$templateVars{'kwTh3'} = $FORM::kwTh3;
454
	    $$templateVars{'kwType4'} = $FORM::kwType4;
455
	    $$templateVars{'keyword4'} = $FORM::keyword4;
456
	    $$templateVars{'kwTh4'} = $FORM::kwTh4;
457
	    $$templateVars{'kwType5'} = $FORM::kwType5;
458
	    $$templateVars{'keyword5'} = $FORM::keyword5;
459
	    $$templateVars{'kwTh5'} = $FORM::kwTh5;
460
	    $$templateVars{'kwType6'} = $FORM::kwType6;
461
	    $$templateVars{'keyword6'} = $FORM::keyword6;
462
	    $$templateVars{'kwTh6'} = $FORM::kwTh6;
463
	    $$templateVars{'kwType7'} = $FORM::kwType7;
464
	    $$templateVars{'keyword7'} = $FORM::keyword7;
465
	    $$templateVars{'kwTh7'} = $FORM::kwTh7;
466
	    $$templateVars{'kwType8'} = $FORM::kwType8;
467
	    $$templateVars{'keyword8'} = $FORM::keyword8;
468
	    $$templateVars{'kwTh8'} = $FORM::kwTh8;
469
	    $$templateVars{'kwType9'} = $FORM::kwType9;
470
	    $$templateVars{'keyword9'} = $FORM::keyword9;
471
	    $$templateVars{'kwTh9'} = $FORM::kwTh9;
442
	    $$templateVars{'keyCount'} = $FORM::keyCount;
443
	    foreach my $kyd (param()) {
444
		if ($kyd =~ /keyword/) {
445
		    my $keyIndex = $kyd;
446
		    $keyIndex =~ s/keyword//; # get the index of the parameter 0, ..., 10
447
		    my $keyType = "kwType".$keyIndex;
448
		    my $keyTh = "kwTh".$keyIndex;
449
		    if ( $keyIndex =~ /[0-9]/ ){
450
			if (hasContent(param($kyd)) && hasContent(param($keyType)) && hasContent(param($keyTh))) {
451
			    debug("Registry processing keyword: $kyd = ".param($kyd)." $keyType = ".param($keyType)." $keyTh = ".param($keyTh));
452
			    $$templateVars{$kyd} = param($kyd);
453
			    $$templateVars{$keyType} = param($keyType);
454
			    $$templateVars{$keyTh} = param($keyTh);
455
			}
456
		    }
457
		}
458
	    }
472 459
	    $$templateVars{'addComments'} = $FORM::addComments;
473 460
	    $$templateVars{'useConstraints'} = $FORM::useConstraints;
474 461
	    $$templateVars{'useConstraintsOther'} = $FORM::useConstraintsOther;
......
618 605
    $$templateVars{'origNamelast10'} = $FORM::origNamelast10;
619 606
    $$templateVars{'origRole10'} = $FORM::origRole10;
620 607
    $$templateVars{'abstract'} = $FORM::abstract;
621
    $$templateVars{'keyword0'} = $FORM::keyword0;
622
    $$templateVars{'kwType0'} = $FORM::kwType0;
623
    $$templateVars{'kwTh0'} = $FORM::kwTh0;
624
    $$templateVars{'kwType1'} = $FORM::kwType1;
625
    $$templateVars{'keyword1'} = $FORM::keyword1;
626
    $$templateVars{'kwTh1'} = $FORM::kwTh1;
627
    $$templateVars{'kwType2'} = $FORM::kwType2;
628
    $$templateVars{'keyword2'} = $FORM::keyword2;
629
    $$templateVars{'kwTh2'} = $FORM::kwTh2;
630
    $$templateVars{'kwType3'} = $FORM::kwType3;
631
    $$templateVars{'keyword3'} = $FORM::keyword3;
632
    $$templateVars{'kwTh3'} = $FORM::kwTh3;
633
    $$templateVars{'kwType4'} = $FORM::kwType4;
634
    $$templateVars{'keyword4'} = $FORM::keyword4;
635
    $$templateVars{'kwTh4'} = $FORM::kwTh4;
636
    $$templateVars{'kwType5'} = $FORM::kwType5;
637
    $$templateVars{'keyword5'} = $FORM::keyword5;
638
    $$templateVars{'kwTh5'} = $FORM::kwTh5;
639
    $$templateVars{'kwType6'} = $FORM::kwType6;
640
    $$templateVars{'keyword6'} = $FORM::keyword6;
641
    $$templateVars{'kwTh6'} = $FORM::kwTh6;
642
    $$templateVars{'kwType7'} = $FORM::kwType7;
643
    $$templateVars{'keyword7'} = $FORM::keyword7;
644
    $$templateVars{'kwTh7'} = $FORM::kwTh7;
645
    $$templateVars{'kwType8'} = $FORM::kwType8;
646
    $$templateVars{'keyword8'} = $FORM::keyword8;
647
    $$templateVars{'kwTh8'} = $FORM::kwTh8;
648
    $$templateVars{'kwType9'} = $FORM::kwType9;
649
    $$templateVars{'keyword9'} = $FORM::keyword9;
650
    $$templateVars{'kwTh9'} = $FORM::kwTh9;
608
    $$templateVars{'keyCount'} = $FORM::keyCount;
609
    foreach my $kyd (param()) {
610
	if ($kyd =~ /keyword/) {
611
	    my $keyIndex = $kyd;
612
	    $keyIndex =~ s/keyword//; # get the index of the parameter 0, ..., 10
613
	    my $keyType = "kwType".$keyIndex;
614
	    my $keyTh = "kwTh".$keyIndex;
615
	    if ( $keyIndex =~ /[0-9]/ ){
616
		if (hasContent(param($kyd)) && hasContent(param($keyType)) && hasContent(param($keyTh))) {
617
		    debug("Registry processing keyword: $kyd = ".param($kyd)." $keyType = ".param($keyType)." $keyTh = ".param($keyTh));
618
		    $$templateVars{$kyd} = param($kyd);
619
		    $$templateVars{$keyType} = param($keyType);
620
		    $$templateVars{$keyTh} = param($keyTh);
621
		}
622
	    }
623
	}
624
    }
651 625
    $$templateVars{'addComments'} = $FORM::addComments;
652 626
    $$templateVars{'useConstraints'} = $FORM::useConstraints;
653 627
    $$templateVars{'useConstraintsOther'} = $FORM::useConstraintsOther;
......
1919 1893
    }
1920 1894

  
1921 1895
    $results = $doc->findnodes('//dataset/keywordSet');
1922
    if ($results->size() > 10) {
1923
        errMoreThanN("keywordSet");
1924
    } else {
1925
        my $count = 0;
1926
        foreach $node ($results->get_nodelist) {
1927
            $tempResult = $node->findnodes('./keyword');
1928
            if ($tempResult->size() > 1) {
1929
                errMoreThanOne("keyword");
1930
            } else {
1931
                foreach $tempNode ($tempResult->get_nodelist) {
1932
                    $$templateVars{"keyword$count"} = $tempNode->textContent();
1933
                    if ($tempNode->hasAttributes()) {
1934
                        my @attlist = $tempNode->attributes();
1935
                        $$templateVars{"kwType$count"} = $attlist[0]->value;
1936
                    }  
1937
                 } 
1938
            }
1939
            $$templateVars{"kwTh$count"} = findValue($node, "keywordThesaurus");
1940
            $count++;
1941
        }
1896

  
1897
    my $count = 0;
1898
    foreach $node ($results->get_nodelist) {
1899
	$tempResult = $node->findnodes('./keyword');
1900
	if ($tempResult->size() > 1) {
1901
	    errMoreThanOne("keyword");
1902
	} else {
1903
	    foreach $tempNode ($tempResult->get_nodelist) {
1904
		$$templateVars{"keyword$count"} = $tempNode->textContent();
1905
		if ($tempNode->hasAttributes()) {
1906
		    my @attlist = $tempNode->attributes();
1907
		    $$templateVars{"kwType$count"} = $attlist[0]->value;
1908
		}  
1909
	    } 
1910
	}
1911
	$$templateVars{"kwTh$count"} = findValue($node, "keywordThesaurus");
1912
	$count++;
1913
    }
1942 1914
    
1943
        while ($count<11) {
1944
            $$templateVars{"kwType$count"} = "none";
1945
            $$templateVars{"kwTh$count"} = "none";
1946
            $count++;
1947
        }
1948
    }
1949 1915

  
1950 1916
    $results = $doc->findnodes('//dataset/additionalInfo');
1951 1917
    if ($results->size() > 1) {
......
2553 2519
        $$templateVars{'origRole10'} = $FORM::origRole10;
2554 2520
    }
2555 2521
    $$templateVars{'abstract'} = $FORM::abstract;
2556
    $$templateVars{'keyword0'} = $FORM::keyword0;
2557
    $$templateVars{'kwType0'} = $FORM::kwType0;
2558
    $$templateVars{'kwTh0'} = $FORM::kwTh0;
2559
    $$templateVars{'kwType1'} = $FORM::kwType1;
2560
    $$templateVars{'keyword1'} = $FORM::keyword1;
2561
    $$templateVars{'kwTh1'} = $FORM::kwTh1;
2562
    $$templateVars{'kwType2'} = $FORM::kwType2;
2563
    $$templateVars{'keyword2'} = $FORM::keyword2;
2564
    $$templateVars{'kwTh2'} = $FORM::kwTh2;
2565
    $$templateVars{'kwType3'} = $FORM::kwType3;
2566
    $$templateVars{'keyword3'} = $FORM::keyword3;
2567
    $$templateVars{'kwTh3'} = $FORM::kwTh3;
2568
    $$templateVars{'kwType4'} = $FORM::kwType4;
2569
    $$templateVars{'keyword4'} = $FORM::keyword4;
2570
    $$templateVars{'kwTh4'} = $FORM::kwTh4;
2571
    $$templateVars{'kwType5'} = $FORM::kwType5;
2572
    $$templateVars{'keyword5'} = $FORM::keyword5;
2573
    $$templateVars{'kwTh5'} = $FORM::kwTh5;
2574
    $$templateVars{'kwType6'} = $FORM::kwType6;
2575
    $$templateVars{'keyword6'} = $FORM::keyword6;
2576
    $$templateVars{'kwTh6'} = $FORM::kwTh6;
2577
    $$templateVars{'kwType7'} = $FORM::kwType7;
2578
    $$templateVars{'keyword7'} = $FORM::keyword7;
2579
    $$templateVars{'kwTh7'} = $FORM::kwTh7;
2580
    $$templateVars{'kwType8'} = $FORM::kwType8;
2581
    $$templateVars{'keyword8'} = $FORM::keyword8;
2582
    $$templateVars{'kwTh8'} = $FORM::kwTh8;
2583
    $$templateVars{'kwType9'} = $FORM::kwType9;
2584
    $$templateVars{'keyword9'} = $FORM::keyword9;
2585
    $$templateVars{'kwTh9'} = $FORM::kwTh9;
2522
    $$templateVars{'keyCount'} = $FORM::keyCount;
2523
    foreach my $kyd (param()) {
2524
	if ($kyd =~ /keyword/) {
2525
	    my $keyIndex = $kyd;
2526
	    $keyIndex =~ s/keyword//; # get the index of the parameter 0, ..., 10
2527
	    my $keyType = "kwType".$keyIndex;
2528
	    my $keyTh = "kwTh".$keyIndex;
2529
	    if ( $keyIndex =~ /[0-9]/ ){
2530
		if (hasContent(param($kyd)) && hasContent(param($keyType)) && hasContent(param($keyTh))) {
2531
		    debug("Registry processing keyword: $kyd = ".param($kyd)." $keyType = ".param($keyType)." $keyTh = ".param($keyTh));
2532
		    $$templateVars{$kyd} = param($kyd);
2533
		    $$templateVars{$keyType} = param($keyType);
2534
		    $$templateVars{$keyTh} = param($keyTh);
2535
		}
2536
	    }
2537
	}
2538
    }
2586 2539
    $$templateVars{'addComments'} = $FORM::addComments;
2587 2540
    $$templateVars{'useConstraints'} = $FORM::useConstraints;
2588 2541
    $$templateVars{'useConstraintsOther'} = $FORM::useConstraintsOther;
......
2747 2700
    $$templateVars{'origNamelast10'} = $FORM::origNamelast10;
2748 2701
    $$templateVars{'origRole10'} = $FORM::origRole10;
2749 2702
    $$templateVars{'abstract'} = $FORM::abstract;
2750
    $$templateVars{'keyword0'} = $FORM::keyword0;
2751
    $$templateVars{'kwType0'} = $FORM::kwType0;
2752
    $$templateVars{'kwTh0'} = $FORM::kwTh0;
2753
    $$templateVars{'kwType1'} = $FORM::kwType1;
2754
    $$templateVars{'keyword1'} = $FORM::keyword1;
2755
    $$templateVars{'kwTh1'} = $FORM::kwTh1;
2756
    $$templateVars{'kwType2'} = $FORM::kwType2;
2757
    $$templateVars{'keyword2'} = $FORM::keyword2;
2758
    $$templateVars{'kwTh2'} = $FORM::kwTh2;
2759
    $$templateVars{'kwType3'} = $FORM::kwType3;
2760
    $$templateVars{'keyword3'} = $FORM::keyword3;
2761
    $$templateVars{'kwTh3'} = $FORM::kwTh3;
2762
    $$templateVars{'kwType4'} = $FORM::kwType4;
2763
    $$templateVars{'keyword4'} = $FORM::keyword4;
2764
    $$templateVars{'kwTh4'} = $FORM::kwTh4;
2765
    $$templateVars{'kwType5'} = $FORM::kwType5;
2766
    $$templateVars{'keyword5'} = $FORM::keyword5;
2767
    $$templateVars{'kwTh5'} = $FORM::kwTh5;
2768
    $$templateVars{'kwType6'} = $FORM::kwType6;
2769
    $$templateVars{'keyword6'} = $FORM::keyword6;
2770
    $$templateVars{'kwTh6'} = $FORM::kwTh6;
2771
    $$templateVars{'kwType7'} = $FORM::kwType7;
2772
    $$templateVars{'keyword7'} = $FORM::keyword7;
2773
    $$templateVars{'kwTh7'} = $FORM::kwTh7;
2774
    $$templateVars{'kwType8'} = $FORM::kwType8;
2775
    $$templateVars{'keyword8'} = $FORM::keyword8;
2776
    $$templateVars{'kwTh8'} = $FORM::kwTh8;
2777
    $$templateVars{'kwType9'} = $FORM::kwType9;
2778
    $$templateVars{'keyword9'} = $FORM::keyword9;
2779
    $$templateVars{'kwTh9'} = $FORM::kwTh9;
2703
    $$templateVars{'keyCount'} = $FORM::keyCount;
2704
    foreach my $kyd (param()) {
2705
	if ($kyd =~ /keyword/) {
2706
	    my $keyIndex = $kyd;
2707
	    $keyIndex =~ s/keyword//; # get the index of the parameter 0, ..., 10
2708
	    my $keyType = "kwType".$keyIndex;
2709
	    my $keyTh = "kwTh".$keyIndex;
2710
	    if ( $keyIndex =~ /[0-9]/ ){
2711
		if (hasContent(param($kyd)) && hasContent(param($keyType)) && hasContent(param($keyTh))) {
2712
		    debug("Registry processing keyword: $kyd = ".param($kyd)." $keyType = ".param($keyType)." $keyTh = ".param($keyTh));
2713
		    $$templateVars{$kyd} = param($kyd);
2714
		    $$templateVars{$keyType} = param($keyType);
2715
		    $$templateVars{$keyTh} = param($keyTh);
2716
		}
2717
	    }
2718
	}
2719
    }
2720

  
2780 2721
    $$templateVars{'addComments'} = $FORM::addComments;
2781 2722
    $$templateVars{'useConstraints'} = $FORM::useConstraints;
2782 2723
    $$templateVars{'useConstraintsOther'} = $FORM::useConstraintsOther;

Also available in: Unified diff