Changeset 27333 for main

Timestamp:

2013-05-14T14:25:55+12:00 (11 years ago)

Author:

ak19

Message:

1. Added the metadataaction::get_import_metadata_array() subroutine for completion and tested it. 2. A couple of unicode subroutines print warnings when parameters are undefined. Since they can be undefined sometimes, added a test for this so as to avoid the unnecessary warnings.

Location:

main/trunk/greenstone2/perllib

Files:

• cgiactions/metadataaction.pm (modified) (3 diffs)
• unicode.pm (modified) (2 diffs)

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

@@ -270 +270 @@
     }
     elsif($where =~ m/import/) {
-#   $self->_get_import_metadata_array(@_);
+    $self->_get_import_metadata_array(@_);
     }
     elsif($where =~ m/live/) {
@@ -277 +277 @@
 }
 
+sub _get_import_metadata_array {
+    
+    my $self = shift @_;
+
+    my $collect   = $self->{'collect'};
+    my $gsdl_cgi  = $self->{'gsdl_cgi'};
+    my $site = $self->{'site'};
+    my $collect_dir = $gsdl_cgi->get_collection_dir($site);
+    
+    # look up additional args
+    my $infodbtype = $self->{'infodbtype'};
+    
+    my $archive_dir = &util::filename_cat($collect_dir, $collect, "archives");
+    my $arcinfo_doc_filename = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", $archive_dir);
+    my $json_str      = $self->{'json'};
+    my $doc_array = decode_json $json_str;
+
+    my $json_result_str = "[";
+    my $first_doc_rec = 1;
+    foreach my $doc_array_rec ( @$doc_array ) {
+    
+    my $docid = $doc_array_rec->{'docid'}; # no subsection metadata support in metadata.xml, only toplevel meta
+    
+    if($first_doc_rec) {
+        $first_doc_rec = 0;
+    } else {
+        $json_result_str .= ",";
+    }
+    $json_result_str = $json_result_str . "{\"docid\":\"" . $docid . "\"";  
+
+    my $metatable = $doc_array_rec->{'metatable'}; # a subarray, or need to generate an error saying JSON structure is wrong
+    $json_result_str = $json_result_str . ",\"metatable\":[";
+
+    my $first_rec = 1;
+    foreach my $metatable_rec ( @$metatable ) { # the subarray metatable is an array of hashmaps        
+
+        # Read the docid entry      
+        my $doc_rec = &dbutil::read_infodb_entry($infodbtype, $arcinfo_doc_filename, $docid);
+        # This now stores the full pathname
+        my $import_filename = $doc_rec->{'src-file'}->[0];
+
+        # figure out correct metadata.xml file [?]
+        # Assuming the metadata.xml file is next to the source file
+        # Note: This will not work if it is using the inherited metadata from the parent folder
+        my ($import_tailname, $import_dirname) = File::Basename::fileparse($import_filename);
+        my $metadata_xml_filename = &util::filename_cat($import_dirname, "metadata.xml");
+
+
+        if($first_rec) {
+        $first_rec = 0;
+        } else {
+        $json_result_str .= ",";        
+        }
+        
+        my $metaname  = $metatable_rec->{'metaname'};
+        $json_result_str .= "{\"metaname\":\"$metaname\",\"metavals\":[";
+
+        my $metapos   = $metatable_rec->{'metapos'}; # 0... 1|all|undefined
+        if(!defined $metapos) {
+        $metapos = 0;
+        }
+
+        # Obtain the specified metadata value(s)
+        my $metavalue;
+
+        if($metapos ne "all") { # get the value at a single metapos
+        $metavalue = $self->get_metadata_from_metadata_xml($gsdl_cgi, $metadata_xml_filename, $metaname, $metapos, $import_tailname);
+
+        #print STDERR "**** Metafilename, metaname, metapos, sec_num: $metadata_xml_filename, $metaname, $metapos, $import_tailname\n"; 
+        
+        $json_result_str .= "{\"metapos\":\"$metapos\",\"metavalue\":\"$metavalue\"}";
+
+        } else {
+        my $first_metaval = 1;
+        $metapos = 0;
+        $metavalue = $self->get_metadata_from_metadata_xml($gsdl_cgi, $metadata_xml_filename, $metaname, $metapos, $import_tailname);
+
+        while (defined $metavalue && $metavalue ne "") {
+            if($first_metaval) {        
+            $first_metaval = 0;
+            } else {
+            $json_result_str .= ",";
+            }
+        
+            $json_result_str .= "{\"metapos\":\"$metapos\",\"metavalue\":\"$metavalue\"}";
+
+            $metapos++;
+            $metavalue = $self->get_metadata_from_metadata_xml($gsdl_cgi, $metadata_xml_filename, $metaname, $metapos, $import_tailname);
+        }
+        }
+
+        $json_result_str .= "]}"; # close metavals array and metatable record
+    }
+    
+    $json_result_str .= "]}"; # close metatable array and docid record
+    }
+
+    $json_result_str .= "]"; # close array of docids
+    $gsdl_cgi->generate_ok_message($json_result_str."\n");
+}
 
 # Unused method, but included for completion. Tested, works. Takes a JSON string and returns a JSON string.
@@ -654 +754 @@
             if($parser->{'parameters'}->{'metapos'} > 0) {
             print STDERR "@@@@ WARNING: non-zero metapos.\n";
-            print STDERR "@@@@ Assuming SIMPLE collection and proceeding to retrieve the import meta at".$parser->{'parameters'}->{'metapos'}.".\n";
+            print STDERR "@@@@ Assuming SIMPLE collection and proceeding to retrieve the import meta at position: ".$parser->{'parameters'}->{'metapos'}.".\n";
             }
             $parser->{'pad'}->{'metavalue'} = $attrHash->{'_content'};

main/trunk/greenstone2/perllib/unicode.pm

@@ -158 +158 @@
     my ($in) = @_;
     my $out = [];
+
+    if(!defined $in) {
+    return $out;
+    }
 
     my $i = 0;
@@ -630 +634 @@
     my ($text,$and_numeric_entities) = @_;
 
-    $text =~ s/\%([0-9A-F]{2})/pack('C', hex($1))/ige;
-
-    if ((defined $and_numeric_entities) && ($and_numeric_entities)) {
-    $text =~ s/\&\#x([0-9A-F]+);/pack('C', hex($1))/ige;
-    $text =~ s/\&\#u?([0-9]+);/pack('C', $1)/ige;
+    if(defined $text) {
+    $text =~ s/\%([0-9A-F]{2})/pack('C', hex($1))/ige;
+    
+    if ((defined $and_numeric_entities) && ($and_numeric_entities)) {
+        $text =~ s/\&\#x([0-9A-F]+);/pack('C', hex($1))/ige;
+        $text =~ s/\&\#u?([0-9]+);/pack('C', $1)/ige;
+    }
     }