Changeset 4886

Timestamp:

2003-07-04T12:49:06+12:00 (21 years ago)

Author:

kjdon

Message:

fixed up field and level stuff

Location:

trunk/gsdl3/bin/script

Files:

• activate_gs2_style_coll.pl (modified) (3 diffs)
• convert_coll_from_gs2.pl (modified) (11 diffs)

trunk/gsdl3/bin/script/activate_gs2_style_coll.pl

@@ -164 +164 @@
     $buildwriter->startTag('serviceRack', 'name'=>'GS2MGPPRetrieve');
     $buildwriter->emptyTag('defaultLevel', 'name'=>$textlevel);
-    $buildwriter->startTag('levelList');
-    foreach $level (@levels) {
-        $buildwriter->emptyTag('level', 'name'=>$level);
-    }
-    $buildwriter->endTag('levelList');
     
     
@@ -195 +190 @@
 
         my $horizontalAtTop = "false";
-        if ($classname eq "AZList") { #there may be others
+        if ($classname eq "AZList" || $classname eq "AZCompactList") { #there may be others
         $horizontalAtTop = "true";
         }
@@ -246 +241 @@
     print STDOUT "trying fields\n";
     my $fieldmap = {};
-    if (defined $buildcfg->{'indexfieldmap'}) {
-        print STDOUT "doing fields\n";
-        $fieldmap_t = $buildcfg->{'indexfieldmap'};
-        foreach $f (@$fieldmap_t) {
-        my ($k, $v) = $f =~ /^(.*)\-\>(.*)$/;
-        $fieldmap->{$k} = $v;
+    my $fieldlist = ();
+    if (defined $buildcfg->{'indexfields'}) {
+        push @fieldlist, @{$buildcfg->{'indexfields'}};
+        if (defined $buildcfg->{'indexfieldmap'}) {
+        
+        print STDOUT "doing fields\n";
+        $fieldmap_t = $buildcfg->{'indexfieldmap'};
+        foreach $f (@$fieldmap_t) {
+            my ($k, $v) = $f =~ /^(.*)\-\>(.*)$/;
+            $fieldmap->{$k} = $v;
+        }
         }
         
         $buildwriter->startTag('fieldList');
-        foreach $f (keys %$fieldmap) {
+        foreach $f (@fieldlist) {
         $field = $fieldmap->{$f};
         $buildwriter->emptyTag('field', 'shortname'=>$field, 'name'=>$f);

trunk/gsdl3/bin/script/convert_coll_from_gs2.pl

@@ -78 +78 @@
 
     my $buildtype;
-    if (defined $collectcfg->{'buildtype'}) {
-    $buildtype = $collectcfg->{'buildtype'};
+    if (defined $buildcfg->{'buildtype'}) {
+    $buildtype = $buildcfg->{'buildtype'};
     } else {
     $buildtype = 'mg';
@@ -131 +131 @@
     #indexes
     my $indexmap = {};
+    my $firstindex = "";
+    my $first = 1;
     if (defined $buildcfg->{'indexmap'}) {
     $indexmap_t = $buildcfg->{'indexmap'};
@@ -136 +138 @@
         my ($k, $v) = $i =~ /^(.*)\-\>(.*)$/;
         $indexmap->{$k} = $v;
+        if ($first) {
+        $firstindex = $v;
+        $first = 0;
+        }   
     }
     } else {
@@ -143 +149 @@
     if (defined $collectcfg->{'defaultindex'}) {
     $defaultindex = $collectcfg->{'defaultindex'};
-    } else {
-    print STDERR "defaultindex not defined";
-    }
-    $defaultindex = $indexmap->{$defaultindex};
+    $defaultindex = $indexmap->{$defaultindex};
+    } else {
+    # use the first one
+    $defaultindex = $firstindex;
+    }
+    
     
     # levels for index
@@ -163 +171 @@
     $shortname = $indexmap->{$i};
     if ($buildtype eq 'mgpp') {
-        $collwriter->startTag('index', 'name'=>$shortname, 'content'=>$i, 
-                  'level'=>$level_string);
+        $collwriter->startTag('index', 'name'=>$shortname);
     } elsif ($buildtype eq 'mg') {
-        ($level, $content) = $i =~ /^(.*):(.*)$/;
-        $collwriter->startTag('index', 'name'=>$shortname, 'content'=>$content, 'level'=>$level);
+        $collwriter->startTag('index', 'name'=>$shortname);
     }
     #find the coll meta stuff
@@ -191 +197 @@
     $buildwriter->startTag('serviceRackList');
     
-    my @levels = ('Document');
-    my $defaultlevel = 'Document';
+    my @levels = ();
+    my $defaultlevel;
 
     #do the retrieve service
@@ -198 +204 @@
     if ($buildtype eq 'mgpp') {
     #for each level
-    if (defined $collectcfg->{'levels'}) {
-        push @levels, @{$collectcfg->{'levels'}};
+    if (defined $buildcfg->{'indexlevels'}) {
+        push @levels, @{$buildcfg->{'indexlevels'}};
         
-        foreach $l(@levels){
-        $defaultlevel = 'Section' if $l eq 'Section';
-        }
-    }
-
+        $defaultlevel = $levels[0]; # the first one
+        if (defined $buildcfg->{'textlevel'}) {
+        $textlevel = $buildcfg->{'textlevel'};
+        } else {
+        $textlevel = $defaultlevel;
+        }
+    } else {
+        # should be there, but take a guess 
+        @levels = ('Doc');
+        $defaultlevel = 'Doc';
+        $textlevel = 'Doc';
+    }
+    
     $buildwriter->startTag('serviceRack', 'name'=>'GS2MGPPRetrieve');
-    $buildwriter->emptyTag('defaultLevel', 'name'=>$defaultlevel);
-    $buildwriter->startTag('levelList');
-    foreach $level (@levels) {
-        $buildwriter->emptyTag('level', 'name'=>$level);
-    }
-    $buildwriter->endTag('levelList');
-    
+    $buildwriter->emptyTag('defaultLevel', 'name'=>$textlevel);
+
     
     } else {
@@ -239 +248 @@
         }
         
-        my $document_interleave = "true";
-        my $orientation = "vertical";
         my $nodelinks = 0;
+        my $horizontalAtTop = "false";
         if ($classname eq "AZList" || $classname eq "AZCompactList") { #there may be others
-        $document_interleave = "false";
-        $orientation = "horizontal";
+        $horizontalAtTop = "true";
         $nodelinks = 1;
         }
@@ -260 +267 @@
             $content = @$cl[$i+1];
             last;
-            }elsif ($arg eq "-metadata") {
+            } elsif ($arg eq "-metadata") {
             $content = @$cl[$i+1];
             }
@@ -266 +273 @@
         }
         }
+        if ($horizontalAtTop eq "false") {
+        $buildwriter->emptyTag('classifier', 'name'=>$name, 'content'=>$content);
+        } else {
+        $buildwriter->emptyTag('classifier', 'name'=>$name, 'content'=>$content, 'horizontalAtTop'=>'true');
+        }
         
-        $buildwriter->emptyTag('classifier', 'name'=>$name, 'content'=>$content, 'orientation'=>$orientation, 'documentInterleave'=>$document_interleave);
         
-        $collwriter->startTag('classifier', 'name'=>$name, 'content'=>$content, 'type'=>$classname, 'level'=>'Document');
+        $collwriter->startTag('classifier', 'name'=>$name);
         $vlist = $name."VList";
         $hlist = $name."HList";
@@ -324 +335 @@
     #fieldlist
     my $fieldmap = {};
-    if (defined $buildcfg->{'indexfieldmap'}) {
-        $fieldmap_t = $buildcfg->{'indexfieldmap'};
-        foreach $f (@$fieldmap_t) {
-        my ($k, $v) = $f =~ /^(.*)\-\>(.*)$/;
-        $fieldmap->{$k} = $v;
-        }
-        
+    my $fieldlist = ();
+    if (defined $buildcfg->{'indexfields'}) {
+        push @fieldlist, @{$buildcfg->{'indexfields'}};
+        if (defined $buildcfg->{'indexfieldmap'}) {
+        $fieldmap_t = $buildcfg->{'indexfieldmap'};
+        foreach $f (@$fieldmap_t) {
+            my ($k, $v) = $f =~ /^(.*)\-\>(.*)$/;
+            $fieldmap->{$k} = $v;
+        }
+        }
         $buildwriter->startTag('fieldList');
-        foreach $f (keys %$fieldmap) {
+        foreach $f (@fieldlist) {
         $field = $fieldmap->{$f};
         $buildwriter->emptyTag('field', 'shortname'=>$field, 'name'=>$f);