Changeset 4884 for trunk/gsdl3

Timestamp:

2003-07-04T11:38:33+12:00 (21 years ago)

Author:

kjdon

Message:

these now work for colls built with gsdl-2.40. Note they probably wont work for mgpp colls with gsdl 2.39 and earlier

Location:

trunk/gsdl3/bin/script

Files:

• activate_gs2_style_coll.pl (modified) (7 diffs)
• gs2_mkcol.pl (modified) (3 diffs)

trunk/gsdl3/bin/script/activate_gs2_style_coll.pl

@@ -86 +86 @@
 
     my $buildtype;
-    if (defined $collectcfg->{'buildtype'}) {
-    $buildtype = $collectcfg->{'buildtype'};
+    if (defined $buildcfg->{'buildtype'}) {
+    $buildtype = $buildcfg->{'buildtype'};
     } else {
     $buildtype = 'mg';
@@ -109 +109 @@
     #indexes
     my $indexmap = {};
+    my $firstindex = "";
+    my $first = 1;
     if (defined $buildcfg->{'indexmap'}) {
     $indexmap_t = $buildcfg->{'indexmap'};
@@ -114 +116 @@
         my ($k, $v) = $i =~ /^(.*)\-\>(.*)$/;
         $indexmap->{$k} = $v;
+        if ($first) {
+        $firstindex = $v;
+        $first = 0;
+        }
     }
     } else {
@@ -121 +127 @@
     if (defined $collectcfg->{'defaultindex'}) {
     $defaultindex = $collectcfg->{'defaultindex'};
-    } else {
-    print STDERR "defaultindex not defined";
-    }
-    $defaultindex = $indexmap->{$defaultindex};
+    $defaultindex = $indexmap->{$defaultindex};
+    } else {
+    # defaultindex not defined, use the first one
+    $defaultindex = $firstindex;
+    print STDERR "using the first index, $defaultindex\n";
+    }
+   
     
     
     $buildwriter->startTag('serviceRackList');
     
-    my @levels = ('Document');
-    my $defaultlevel = 'Document';
+    my @levels = ();
+    my $defaultlevel;
+    my $textlevel;
 
     #do the retrieve service
@@ -136 +146 @@
     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->emptyTag('defaultLevel', 'name'=>$textlevel);
     $buildwriter->startTag('levelList');
     foreach $level (@levels) {
@@ -175 +193 @@
         next;
         }
-        
-        my $document_interleave = "true";
-        my $orientation = "vertical";
+
+        my $horizontalAtTop = "false";
         if ($classname eq "AZList") { #there may be others
-        $document_interleave = "false";
-        $orientation = "horizontal";
+        $horizontalAtTop = "true";
         }
         if (not $started_classifiers) {
@@ -195 +211 @@
         }
         }
-        
-        $buildwriter->emptyTag('classifier', 'name'=>$name, 'content'=>$content, 'orientation'=>$orientation, 'documentInterleave'=>$document_interleave);
-        
+        if ($horizontalAtTop eq "false") {
+        $buildwriter->emptyTag('classifier', 'name'=>$name, 'content'=>$content);
+        } else {
+        $buildwriter->emptyTag('classifier', 'name'=>$name, 'content'=>$content, 'horizontalAtTop'=>'true');
+        }
     } #foreach classifier
     if ($started_classifiers) {

trunk/gsdl3/bin/script/gs2_mkcol.pl

@@ -122 +122 @@
         $line =~ s/\*\*plugins\*\*/$pluginstring/g;
         $line =~ s/\*\*buildtype\*\*/$buildtype/g;
+        $line =~ s/\*\*searchtype\*\*/$searchtype/g;
         $line =~ s/\*\*indexes\*\*/$indexes/g;
         $line =~ s/\*\*defaultindex\*\*/$defaultindex/g;
         $line =~ s/\*\*indexmeta\*\*/$indexmeta/g;
         $line =~ s/\*\*xmlindexes\*\*/$xmlindexes/g;
-        $line =~ s/\*\*xmlplugins\*\*/$xmlpluginstring/g;
+        #$line =~ s/\*\*xmlplugins\*\*/$xmlpluginstring/g;
         
         print OUTFILE $line;
@@ -230 +231 @@
     $buildtype = "mgpp" unless defined $buildtype;
 
+    $searchtype = "";
+    if ($buildtype eq "mgpp") {
+    $searchtype = "searchtype  plain form";
+    }
     
     if (!defined($title) || $title eq "") {
@@ -277 +282 @@
     if ($buildtype eq "mg") {
     $indexes = "document:text document:Title document:Source";
-    $defaultindex = "document:text";
+    $defaultindex = "defaultindex document:text";
     $indexmeta = "collectionmeta .document:text    \"text\"\ncollectionmeta .document:Title  \"titles\"\ncollectionmeta .document:Source  \"filenames\"\n";
 
-    $xmlindexes = "<index name='dtx' content='text' level='Document'><displayName lang='en'>text</displayName></index>\n<index name='dtt' content='Title' level='Document'><displayName lang='en'>titles</displayName></index>\n<index name='dsr' content='Source' level='Document'><displayName lang='en'>filenames</displayName></index>";
+    $xmlindexes = "<index name='dtx'><displayName lang='en'>text</displayName></index>\n<index name='dtt'><displayName lang='en'>titles</displayName></index>\n<index name='dsr'><displayName lang='en'>filenames</displayName></index>";
     } elsif ($buildtype eq "mgpp") {
-    $indexes = "text,metadata";
-    $defaultindex = "text,metadata";
-    $indexmeta = "collectionmeta .text,metadata    \"text\"\n";
-    $xmlindexes = "<index name='tm' content='text,metadata' level='Document'><displayName lang='en'>text</displayName></index>";
+    $indexes = "allfields text metadata";
+    $defaultindex = "";
+    $indexmeta = "collectionmeta .text    \"text\"\ncollectionmeta .allfields \"entire documents\"\n";
+    $xmlindexes = "<index name='idx'><displayName lang='en'>documents</displayName></index>";
     } else {
     print STDOUT "Error: buildtype should be mg or mgpp, but its $buildtype\n";