X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fhttp_getter%2Fhttp_getter.pl.in;h=e73d9f9878689b039352916e90b29a0abcfcd303;hb=b564f0671c133928e372e352d972a7663b6a9136;hp=ec2814e4841460946f759521304c477cea01cfe8;hpb=b229325170c02aeb2a009737486f7162ac89ed99;p=helm.git

diff --git a/helm/http_getter/http_getter.pl.in b/helm/http_getter/http_getter.pl.in
index ec2814e48..e73d9f987 100755
--- a/helm/http_getter/http_getter.pl.in
+++ b/helm/http_getter/http_getter.pl.in
@@ -97,7 +97,7 @@ while (my $c = $d->accept) {
         my $http_method = $r->method;
         my $http_path = $r->url->path;
         my $http_query = uri_unescape($r->url->query);
-        my $cgi = new CGI($http_query);
+        my $cgi = new CGI("$http_query");
 
 	print "\nUnescaped query: ".$http_query."\n";
 
@@ -314,8 +314,6 @@ EOT
             $uritype = "cic";
            } elsif ($baseuri =~ /^theory:/) {
             $uritype = "theory";
-           } elsif ($baseuri =~ /^\*:/) {
-            $uritype = "any";
            } else {
             $uritype = "invalid";
            }
@@ -360,8 +358,9 @@ EOT
 sub finduris { # find uris for cic and theory trees generation
  my ($uritype,$uripattern,$format) = @_;
  my $content = "";
- my ($uri,$localpart,$dirname);
+ my ($uri,$localpart,$basepart,$dirname,$suffix,$flags,$key);
  my (@itemz,@already_pushed_dir);
+ my (%objects,%dirs); # map uris to suffixes' flags
 
  print "FINDURIS, uritype: $uritype, uripattern: $uripattern, ".
   "format: $format\n\n";
@@ -373,49 +372,101 @@ sub finduris { # find uris for cic and theory trees generation
    if ($uri =~ /^$uritype:$uripattern\//) {
     $localpart = $uri;
     $localpart =~ s/^$uritype:$uripattern\/(.*)/$1/;
-    if ($localpart =~ /^[^\/]*$/) { # no slash, i.e. no dir
-     push @itemz, "object," . $localpart;
-    } else { # exists at least one slash, i.e. a dir
+
+    if ($localpart =~ /^[^\/]*$/) { # no slash, an OBJECT
+     $basepart = $localpart;
+     $basepart =~ s/^(.*)\.types(\.ann)?/$1/; # remove exts .types or
+                                              # .types.ann
+     $flags = $objects{$basepart}; # get old flags
+     if ($localpart =~ /\.ann$/) {
+      $flags = add_flag("ann","YES",$flags);
+     } else {
+      $flags = add_flag("ann","NO",$flags);
+     }
+     if ($localpart =~ /\.types$/) {
+      $flags = add_flag("types","YES",$flags);
+     } elsif ($localpart =~ /\.types\.ann$/) {
+      $flags = add_flag("types","ANN",$flags);
+     } else {
+      $flags = add_flag("types","NO",$flags);
+     }
+     $objects{$basepart} = $flags; # save new flags
+    } else { # exists at least one slash, a DIR
      ($dirname) = split (/\//, $localpart);
-     push @itemz, "dir," . $dirname;
-     #print "LOCALPART $localpart, DIRNAME $dirname\n"; #DEBUG
+     $dirs{$dirname} = ""; # no flags requirement for dir
     }
    }
   }
- } elsif ($uritype eq "any") { # get info for both cic and theory
-  foreach (keys(%map)) {
-   $uri = $_;
-  }
  } else {
   die "getter internal error: unsupported uritype: \"$uritype\"";
  }
- @itemz = sort @itemz; # sort itemz and remove duplicates
- my $lastitem = "";
- if ($format eq "txt") { #now generate output
-  foreach (@itemz) {
-   next if ($_ eq $last);
-   $content .= ($_ . "\n");
-   $last = $_;
+                            # now generate OUTPUT:
+                            # output will be saved in $content
+ if ($format eq "txt") { 
+  foreach $key (sort(keys %dirs)) {
+   $content .= "dir, " . $key . "\n";
+  }
+  foreach $key (sort(keys %objects)) {
+   $content .= "object, $key, " . $objects{$key} . "\n";
   }
  } elsif ($format eq "xml") {
   $content .= "<ls>\n";
-  foreach (@itemz) {
-   next if ($_ eq $last);
-   $last = $_;
-   ($itemtype,$itemdata) = split(/,/, $_);
-   if ($itemtype eq "object") {
-    $content .= "<object type=\"$uritype\">$itemdata</object>\n";
-   } elsif ($itemtype eq "dir") {
-    $content .= "<section>$itemdata</section>\n";
-   }
+  foreach $key (sort(keys %dirs)) {
+   $content .= "\t<section>$key</section>\n";
+  }
+  foreach $key (sort(keys %objects)) {
+   $content .= "\t<object name=\"$key\">\n";
+   $flags = $objects{$key};
+   $flags =~ s/^<(.*)>$/$1/;
+   my ($annflag,$typesflag) = split /,/,$flags;
+   $content .= "\t\t<ann value=\"$annflag\" />\n";
+   $content .= "\t\t<types value=\"$typesflag\" />\n";
+   $content .= "\t</object>\n";
   }
-  $content .= "</ls>\n"
+  $content .= "</ls>\n";
  } else { # may not enter this branch
   die "Getter internal error: invalid format received by finduris sub";
  }
  return $content;
 }
 
+sub add_flag {
+# manage string like: "<ann_flag,type_flag>"
+# "ann_flag" may be one of "ann_YES", "ann_NO"
+# "type_flag" may be one of "types_NO", "types_YES", "types_ANN"
+# when adding a flag the max between the current flag and the new flag
+# is taken, the orders are ann_NO < ann_YES and types_NO < types_YES <
+# types_ANN
+ my ($flagtype,$newflag,$str) = @_;
+ $str = "<,>" if ($str eq "");
+ ($str =~ s/^<(.*,.*)>$/$1/) or die "Internal error: ".
+   "wrong string format for flag adding in $str";
+ my ($annflag,$typeflag) = split /,/,$str;
+ if ($flagtype eq "ann") { # ANN flag handling
+  if ($newflag eq "YES") {
+   $annflag = "YES";
+  } elsif ($newflag eq "NO") {
+   $annflag = "NO" unless ($annflag eq "YES");
+  } else {
+   die "Internal error: annflag must be \"YES\" or \"NO\"";
+  }
+ } elsif ($flagtype eq "types") { # TYPES flag handling
+  if ($newflag eq "ANN") {
+   $typeflag = "ANN";
+  } elsif ($newflag eq "YES") {
+   $typeflag = "YES" unless ($typeflag eq "ANN");
+  } elsif ($newflag eq "NO") {
+   $typeflag = "NO"
+     unless (($typeflag eq "ANN") or ($typeflag eq "YES"));
+  } else {
+   die "Internal error: typeflag must be \"YES\", \"NO\" or \"ANN\"";
+  }
+ } else {
+  die "Internal error: unsupported flagtype \"$flagtype\"";
+ }
+ $str = "<$annflag,$typeflag>";
+}
+
 #CSC: Too much powerful: creates even /home, /home/users/, ...
 #CSC: Does not raise errors if could not create dirs/files
 sub mkdirs