Changeset 18901 for gsdl/trunk/perllib/plugins/OAIPlugin.pm

Timestamp:

2009-04-06T15:23:29+12:00 (15 years ago)

Author:

kjdon

Message:

small changes to get this to work with qualified dc

File:

• gsdl/trunk/perllib/plugins/OAIPlugin.pm (modified) (5 diffs)

gsdl/trunk/perllib/plugins/OAIPlugin.pm

@@ -405 +405 @@
     "spatial" => "dc.coverage",
     "temporal" => "dc.coverage",
-    "audience" => "dc.any",
-    "accrualMethod" => "dc.any",
-    "accrualPeriodicity" => "dc.any",
-    "accrualPolicy" => "dc.any",
-    "instructionalMethod" => "dc.any",
-    "provenance" => "dc.any",
-    "rightsHolder" => "dc.any",
-    "mediator" => "audience",
-    "educationLevel" => "audience",
+# these are top level elements in our qualified dc metadata set
+#   "audience" => "dc.any",
+#   "accrualMethod" => "dc.any",
+#   "accrualPeriodicity" => "dc.any",
+#   "accrualPolicy" => "dc.any",
+#   "instructionalMethod" => "dc.any",
+#   "provenance" => "dc.any",
+#   "rightsHolder" => "dc.any",
+    "mediator" => "dc.audience",
+    "educationLevel" => "dc.audience",
     "accessRights" => "dc.rights",
     "license" => "dc.rights",
@@ -421 +422 @@
     my ($prefix,$name) = ($metaname =~ m/^(.*?)\.(.*?)$/);
     
-    if ($prefix eq "dcterms")
+    if ($prefix eq "dcterms" || $prefix eq "dc")
     {
     if (defined $dcterm_mapping->{$name}) 
@@ -448 +449 @@
     # locate and remove outermost tag (ignoring any attribute information in top-level tag)
     my ($wrapper_metadata_xml,$inner_metadata_text) = ($metadata_text =~ m/<([^ >]+).*?>(.*?)<\/\1>/s);
-
     # split tag into namespace and tag name
     my($namespace,$top_level_prefix) = ($wrapper_metadata_xml =~ m/^(.*?):(.*?)$/);
-
     # sometimes, the dc namespace is not specified as the prefix in each element (like <dc:title>)
     # but is rather defined in the wrapper element containing the various dc meta elements,
@@ -474 +473 @@
         $inner_metadata_text = $3;
 
-        # $metaname =~ s/^(dc:)?(.)/\u$2/; # strip of optional prefix and uppercase first letter
+        # $metaname =~ s/^(dc:)?(.)/\u$2/; # strip off optional prefix and uppercase first letter
         $metaname =~ s/:/\./;
         if ($metaname !~ m/\./)
@@ -480 +479 @@
         $metaname = "$top_level_prefix.$metaname";
         }
+
+        $metaname = $self->remap_dcterms_metadata($metaname);
+
+        # uppercase the first char of the name
         $metaname =~ s/\.(.)/\.\u$1/;
-
-        $metaname = $self->remap_dcterms_metadata($metaname);
-
         $metavalue =~ s/\[/&#91;/g;
         $metavalue =~ s/\]/&#93;/g;