Changeset 27021 for main/trunk

Timestamp:

2013-03-07T15:11:32+13:00 (11 years ago)

Author:

ak19

Message:

Now depositdspace uses dc meta fields instead of ds meta fields for those fields that are common to both metadata sets, and ds meta fields are only used for those fields that are unique to the ds meta set (Series, Sponsorship, Abstract).

File:

• main/trunk/greenstone2/macros/depositdspace.dm (modified) (5 diffs)

main/trunk/greenstone2/macros/depositdspace.dm

@@ -278 +278 @@
   \{
       var newstr = str.replace(/\\%2F/g,"/");
-      newstr = newstr.replace(/\\%27/g,"'");
+      newstr = newstr.replace(/\\%27/g,"'"); // most important replacement when reading array metavalues back from db
       newstr = newstr.replace(/\\%22/g,"\\\"");
       newstr = newstr.replace(/\\%26/g,"&");
@@ -1555 +1555 @@
 
 
-  hidden\_field("ds.Title",      "_di1ds.Title_");
-  hidden\_field("ds.Type",       "_di1ds.Type_");
-  hidden\_field("ds.Language",   "_di1ds.Language_");
+  hidden\_field("dc.Title",      "_di1ds.Title_");
+  hidden\_field("dc.Type",       "_di1ds.Type_");
+  hidden\_field("dc.Language",   "_di1ds.Language_");
   hidden\_field("ds.Abstract",   "_di1ds.Abstract_");
   hidden\_field("ds.Sponsorship","_di1ds.Sponsorship_");
-  hidden\_field("ds.Description","_di1ds.Description_");
+  hidden\_field("dc.Description","_di1ds.Description_");
 
   var authornum = "_di1authornum_";
@@ -1566 +1566 @@
   var authorarray = comma\_and\_special_chars\_decode("_di1authorarray_");
   var combauthor = combine\_escauthor(authorarray,authornum,authorsplit);
-  hidden\_multifield("ds.Author",combauthor);
+  hidden\_multifield("dc.Creator",combauthor);
 
   var seriesrepnum = "_di1seriesrepnum_";
@@ -1578 +1578 @@
   var idarray = comma\_and\_special_chars\_decode("_di1identifierarray_");
   var combid = combine\_id(idarray,idnum,idsplit);
-  hidden\_multifield("ds.Identifier",combid);
+  hidden\_multifield("dc.Identifier",combid);
 
 
@@ -1585 +1585 @@
   var subarray = comma\_and\_special_chars\_decode("_di1subjectarray_");
   var combsub = combine\_flat(subarray,subnum,subsplit);
-  hidden\_multifield("ds.Subject",combsub);
+  hidden\_multifield("dc.Subject",combsub);
 
 </script>