Changeset 25102

Timestamp:

2012-02-20T15:58:01+13:00 (12 years ago)

Author:

sjm84

Message:

Fixed a few bugs

File:

• main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm (modified) (9 diffs)

main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm

@@ -724 +724 @@
 sub dxml_metadata
 {
+    print STDERR "IN dxml_metadata\n";
     my ($tagname, $attrHash, $contextArray, $parentDataArray, $parser) = @_;
     my $metaname = $parser->{'parameters'}->{'metaname'};
@@ -765 +766 @@
                 $parser->{'parameters'}->{'metamode'} = "done";
             }
-            else if(defined $parser->{'parameters'}->{'prevmetavalue'} && $parser->{'parameters'}->{'prevmetavalue'} == $attrHash->{'_content'})
+            elsif(defined $parser->{'parameters'}->{'prevmetavalue'} && $parser->{'parameters'}->{'prevmetavalue'} == $attrHash->{'_content'})
             {
+                my $metavalue = $parser->{'parameters'}->{'metavalue'};
                 $attrHash->{'_content'} = $metavalue;
                 $parser->{'parameters'}->{'metamode'} = "done";
@@ -780 +782 @@
 sub dxml_description
 {
+    print STDERR "IN dxml_description\n";
     my ($tagname, $attrHash, $contextArray, $parentDataArray, $parser) = @_;
     my $metamode = $parser->{'parameters'}->{'metamode'};
@@ -815 +818 @@
 sub dxml_start_section
 {
+    print STDERR "IN DXML_START_SECTION\n";
     my ($tagname, $attrHash, $contextArray, $parentDataArray, $parser) = @_;
 
@@ -849 +853 @@
     $parser->{'parameters'}->{'curr_section_num'}   = $new_secnum;
 
-    ##print STDERR "*** In Section: $new_secnum\n";
+    print STDERR "*** In Section: $new_secnum\n";
 }
 
 sub edit_xml_file
 {
+    print STDERR "IN EDIT XML FILE\n";
     my $self = shift @_;
     my ($gsdl_cgi, $filename, $start_rules, $rules, $options) = @_;
@@ -895 +900 @@
 sub edit_doc_xml
 {
+    print STDERR "IN EDIT DOC XML\n";
     my $self = shift @_;
     my ($gsdl_cgi, $doc_xml_filename, $metaname, $metavalue, $metapos, $metamode, $opt_secnum, $prevmetavalue) = @_;
@@ -925 +931 @@
 sub set_archives_metadata_entry
 {
+    print STDERR "IN SET ARCHIVES ENTRY\n";
     my $self = shift @_;
     my ($gsdl_cgi,$archive_dir, $collect_dir,$collect, $infodbtype,$docid,$metaname,$metapos,$metavalue,$metamode,$prevmetavalue) = @_;
@@ -954 +961 @@
 sub set_archives_metadata
 {
+    print STDERR "IN SET ARCHIVES\n";
     my $self = shift @_;
 
@@ -981 +989 @@
     my $metaname   = $self->{'metaname'};
     my $metavalue  = $self->{'metavalue'};
-    my $prevmetavalue = $self->{'prevmetavalue'}
+    my $prevmetavalue = $self->{'prevmetavalue'};
     
     my $metapos    = $self->{'metapos'};