Changeset 8507

Timestamp:

2004-11-10T16:00:42+13:00 (19 years ago)

Author:

kjdon

Message:

if no CL1Vlist, look for VList when doing format for classifiers. also remove ex. from metadata names

File:

• trunk/gsdl3/bin/script/convert_coll_from_gs2.pl (modified) (2 diffs)

trunk/gsdl3/bin/script/convert_coll_from_gs2.pl

@@ -299 +299 @@
         $dlist = "DateList";
         }
-        if (defined $format->{$vlist} || defined $format->{$hlist} || defined $format->{$dlist}) {
+        if (defined $format->{$vlist} || defined $format->{"VList"}|| defined $format->{$hlist} || defined $format->{"HList"} || defined $format->{$dlist}) {
         $collwriter->startTag('format');
         if (defined $format->{$vlist}) {
             write_format($collwriter, $format->{$vlist});
+        } elsif (defined $format->{"VList"}) {
+            # use VList if no specific one
+            write_format($collwriter, $format->{"VList"});
         }
         if (defined $format->{$hlist}) {
             write_format($collwriter, $format->{$hlist});
+        } elsif (defined $format->{"HList"}) {
+            # use HList if no specific one
+            write_format($collwriter, $format->{"HList"});
         }
         if (defined $format->{$dlist}) {
@@ -446 +452 @@
     #now do the rest of the [] which are assumed to be metadata
     $old_format =~ s/\[([^\]]*\:)?([^\]\:]*)\]/\<gsf:metadata name=\'$2\' select=\'$1\'\/\>/g;
+    # remove ex.
+    $old_format =~ s/<gsf:metadata name=\'ex\.([^\']+)\'/<gsf:metadata name=\'$1\'/g;
     #do the parent stuff
     $old_format =~ s/(select=\'parent)\:\'/$1\'/g;