Changeset 24306 for main/trunk/greenstone2

Timestamp:

2011-07-22T20:24:23+12:00 (13 years ago)

Author:

ak19

Message:

More changes to do with the ex. prefixed to embedded metadata (that may have an additional metadata set as namespace qualifier). The C code now removes the ex. prefix only if there are no other metadataset qualifiers in the metadata name.

Location:

main/trunk/greenstone2

Files:

• perllib/plugins/DSpacePlugin.pm (modified) (3 diffs)
• runtime-src/src/recpt/formattools.cpp (modified) (2 diffs)
• runtime-src/src/recpt/querytools.cpp (modified) (1 diff)

main/trunk/greenstone2/perllib/plugins/DSpacePlugin.pm

@@ -286 +286 @@
     }
 
-    my $mimetype_list = $self->{'saved_metadata'}->{'dc.Format^mimetype'};
+    my $mimetype_list = $self->{'saved_metadata'}->{'ex.dc.Format^mimetype'};
     my ($doc_file_mimes, $assoc_file_mimes) = $self->read_content($dir, $only_first_doc, $first_inorder_ext, 
                                   $first_inorder_mime, $mimetype_list);
@@ -300 +300 @@
     push(@$extrametakeys,$file_re);
 
-    if (defined $self->{'saved_metadata'}->{'dc.Format^extent'}) {
-    delete $self->{'saved_metadata'}->{'dc.Format^extent'};
+    if (defined $self->{'saved_metadata'}->{'ex.dc.Format^extent'}) {
+    delete $self->{'saved_metadata'}->{'ex.dc.Format^extent'};
     }
 
     if (defined $mimetype_list) {
-    delete $self->{'saved_metadata'}->{'dc.Format^mimetype'};
+    delete $self->{'saved_metadata'}->{'ex.dc.Format^mimetype'};
 
     # Temporarily store associate file info in metadata table
@@ -369 +369 @@
     if ($metaname ne "description" || $qualifier ne "provenance") {
         $metaname .= "^$qualifier" if ($qualifier ne "none" && $qualifier ne "");
-        $self->{'metaname'} = "dc.\u$metaname";
+        $self->{'metaname'} = "ex.dc.\u$metaname";
     }
     }

main/trunk/greenstone2/runtime-src/src/recpt/formattools.cpp

@@ -622 +622 @@
   
   // check for ex. which may occur in format statements
-  if (meta.size()>3 && (substr(meta.begin(), meta.begin()+3) == "ex.")) {
+  // remove "ex." prefix, but only if there are no other metadata set qualifiers 
+  // in the metaname, since we want to retain prefixes like "ex.dc." as-is
+  text_t::iterator period = findchar(meta.begin(), meta.end(), '.');
+  text_t::iterator lastperiod = findlastchar(meta.begin(), meta.end(), '.');
+
+  if (meta.size()>3 && (substr(meta.begin(), meta.begin()+3) == "ex.") && period == lastperiod) {
     meta = substr (meta.begin()+3, meta.end());
   }
@@ -644 +649 @@
   
   // check for ex. which may occur in format statements
-  if (meta.size()>3 && (substr(meta.begin(), meta.begin()+3) == "ex.")) {
+  // remove "ex." prefix, but only if there are no other metadata set qualifiers 
+  // in the metaname, since we want to retain prefixes like "ex.dc." as-is
+  text_t::iterator period = findchar(meta.begin(), meta.end(), '.');
+  text_t::iterator lastperiod = findlastchar(meta.begin(), meta.end(), '.');
+
+  if (meta.size()>3 && (substr(meta.begin(), meta.begin()+3) == "ex.") && period == lastperiod) {
     meta = substr (meta.begin()+3, meta.end());
   }

main/trunk/greenstone2/runtime-src/src/recpt/querytools.cpp

@@ -989 +989 @@
     if (!tag.empty()) {
 
-      if (tag.size()>3 && (substr(tag.begin(), tag.begin()+3) == "ex.")) {
+      // remove "ex." prefix, but only if there are no other metadata set qualifiers 
+      // in the metaname, since we want to retain prefixes like "ex.dc." as-is
+      text_t::iterator period = findchar(tag.begin(), tag.end(), '.');
+      text_t::iterator lastperiod = findlastchar(tag.begin(), tag.end(), '.');
+
+      if (tag.size()>3 && (substr(tag.begin(), tag.begin()+3) == "ex.") && period == lastperiod) {
     tag = substr (tag.begin()+3, tag.end());
       }