getter flags considered

diff --git a/helm/cgi/mkindexcic.pl b/helm/cgi/mkindexcic.pl
index 0033a512ae210a7ec954e1f9f4478958df1f3b3f..e592b057962b4870245d7665436dcb69070a7d8c 100755 (executable)
--- a/helm/cgi/mkindexcic.pl
+++ b/helm/cgi/mkindexcic.pl
@@ -44,7 +44,10 @@ EOT
 }
 
 foreach $i (@filenames) {
-   my ($type,$name) = split(/,/, $i);
+   my ($type,$name,$flags) = split(/, /, $i);
+   my ($flagscic, $flagstypes) = split(/,/, $flags);
+   $flagscic =~ s/^<(.*)/$1/;
+   $flagstypes =~ s/(.*)>$/$1/;
    if ($type eq "dir") {
       $output .= <<EOT;
 <tr>
@@ -54,22 +57,12 @@ foreach $i (@filenames) {
 </tr>
 EOT
    } elsif ($type eq "object") {
-        if ($name =~ /\.(con|var|ind)(\.types)?$/) {
+        if ($name =~ /\.(con|var|ind)$/) {
            # cic file
             $output .= <<EOT;
 <tr>
 <td><img border="0" src="/icons/generic.red.gif" alt="[DIR]"></td>
-<td><a href="" target="cic" onClick="this.href=makeURL('cic','$uri$name','$processor_url','$getter_url')" onMouseOver="window.status='$uri$name'; return true">$name</a>
-</tr>
-EOT
-        } elsif ($name =~ /\.(con|var|ind)\.ann$/) {
-            my $name_without_ann = $name;
-            $name_without_ann_and_xml =~ s/(.*)\.ann/$1/;
-           # cic file
-            $output .= <<EOT;
-<tr>
-<td><img border="0" src="/icons/generic.red.gif" alt="[DIR]"></td>
-<td><a href="" target="cic" onClick="this.href=makeURL('cic','$uri$name_without_ann&annuri=$uri$name','$processor_url','$getter_url')" onMouseOver="window.status='$uri$name'; return true">$name</a>
+<td><a href="" target="cic" onClick="this.href=makeURL('cic','$uri$name','$processor_url','$getter_url','$flagscic','$flagstypes')" onMouseOver="window.status='$uri$name'; return true">$name</a>
 </tr>
 EOT
          } else {

diff --git a/helm/cgi/mkindextheory.pl b/helm/cgi/mkindextheory.pl
index 05bb5b925bf91fbc48255c9c25b0ef4afe79373b..b92f363611f6437db70f20e4eeb12ad84fe6e3cd 100755 (executable)
--- a/helm/cgi/mkindextheory.pl
+++ b/helm/cgi/mkindextheory.pl
@@ -44,7 +44,10 @@ EOT
 }
 
 foreach $i (@filenames) {
-   my ($type,$name) = split(/,/, $i);
+   my ($type,$name,$flags) = split(/, /, $i);
+   my ($flagscic, $flagstypes) = split(/,/, $flags);
+   $flagscic =~ s/^<(.*)/$1/;
+   $flagstypes =~ s/(.*)>$/$1/;
    if ($type eq "dir") {
       $output .= <<EOT;
 <tr>
@@ -58,7 +61,7 @@ EOT
            $output .= <<EOT;
 <tr>
 <td><img border="0" src="/icons/generic.red.gif" alt="[DIR]"></td>
-<td><a href="" target="theory" onClick="this.href=makeURL('theory','$uri$name','$processor_url','$getter_url')" onMouseOver="window.status='$uri$name'; return true">$name</a>
+<td><a href="" target="theory" onClick="this.href=makeURL('theory','$uri$name','$processor_url','$getter_url','$flagscic','$flagstypes')" onMouseOver="window.status='$uri$name'; return true">$name</a>
 </tr>
 EOT
          } else {