ocaml 3.09 transition

[helm.git] / helm / cgi / mkindexcic.pl

diff --git a/helm/cgi/mkindexcic.pl b/helm/cgi/mkindexcic.pl
index 0033a512ae210a7ec954e1f9f4478958df1f3b3f..a31f5ecfb08d2316e919fd37df760e0016c99950 100755 (executable)
--- a/helm/cgi/mkindexcic.pl
+++ b/helm/cgi/mkindexcic.pl
@@ -20,13 +20,14 @@ use CGI;
 
 my $cgi = new CGI($ENV{"REQUEST_URL"});
 $uri = $cgi->param('cicuri');
+$getterURL = $cgi->param('getterURL');
 $uri =~ s/(.*)\/$/$1/; # Remove a final slash if present
 $uri .= "/"; # Put a final slash
 $myurl = $cgi->url();
 
 $cont = ""; # modified by side-effect by &callback
 my $ua = LWP::UserAgent->new;
-my $request = HTTP::Request->new(GET => $getter_url."ls?format=txt&baseuri=".$uri);
+my $request = HTTP::Request->new(GET => $getterURL."ls?format=txt&baseuri=".$uri);
 my $response = $ua->request($request, \&callback);
  
 @filenames = split(/\n/, $cont);
@@ -38,38 +39,31 @@ if ($uri ne "cic:/") {
  $output = <<EOT;
 <tr>
 <td><img border="0" src="/icons/back.gif" alt="[BACK]"></td>
-<td><a href="$myurl" onClick="top.frames[0].document.forms[0].hiddencicuri.value='$uridotdot'; refreshReload(); refreshCICHeader(); this.search='?cicuri=$uridotdot';" onMouseOver="window.status='$uridotdot'; return true">Parent Directory</a></td>
+<td><a href="$myurl" onClick="top.cicuri='$uridotdot'; refreshReload(); refreshCICHeader(); this.search='?cicuri=$uridotdot&getterURL=$getterURL';" onMouseOver="window.status='$uridotdot'; return true">Parent Directory</a></td>
 </tr>
 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>
 <td><img border="0" src="/icons/folder.gif" alt="[DIR]"></td>
-<td><a href="$myurl" onClick="top.frames[0].document.forms[0].hiddencicuri.value='$uri$name'; refreshReload(); refreshCICHeader(); this.search='?cicuri=$uri$name';" onMouseOver="window.status='$uri$name'; return true">$name</a></td>
+<td><a href="$myurl" onClick="top.cicuri='$uri$name'; refreshReload(); refreshCICHeader(); this.search='?cicuri=$uri$name&getterURL=$getterURL';" onMouseOver="window.status='$uri$name'; return true">$name</a></td>
 </tr>
 </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','$flagscic','$flagstypes')" onMouseOver="window.status='$uri$name'; return true">$name</a>
 </tr>
 EOT
          } else {