Changeset 4724 for trunk/Ohana

Timestamp:

Aug 7, 2005, 3:02:46 PM (21 years ago)

Author:

eugene

Message:

cleaning up web pages

Location:

trunk/Ohana/doc/www

Files:

• . (modified) (1 prop)
• .cvsignore (added)
• mkhtml (modified) (1 diff)
• mkidx (modified) (4 diffs)

trunk/Ohana/doc/www/mkhtml

@@ -110 +110 @@
                 $index =~ s|class=dir|class=dsl|;
                 $index =~ s|class=dl|class=sl|;
+                $index =~ s|$file>\s+-\s+|$file> + |;
             }
             # interpolate ROOT

trunk/Ohana/doc/www/mkidx

@@ -27 +27 @@
     my(@updex)    = @_;
 
-    my($i);
-    my($line);
+    my($i, $j);
+    my($line, $value, $dir);
     my(@list);
     my($file, $root, $link, $ext);
-    my(@dirs)  = ();
-    my(@docs)  = ();
-    my(@txts)  = ();
-    my(@index) = ();
+    my(@seq)    = ();
+    my(@dirs)   = ();
+    my(@mydirs) = ();
+    my(@docs)   = ();
+    my(@txts)   = ();
+    my(@index)  = ();
+    my(@mydex)  = ();
+    my($Nmydex);
+    my(@seqline);
 
     # if this directory contains a template file, reset entry and level
@@ -63 +68 @@
         if (-e "$file/noindex.idx") { next; }
 
-        push @dirs, $file;
+        push @mydirs, $file;
 
         $line = sprintf "<tr><td class=dir%d> <a class=dl %-30s -%20s </a></td></tr>", $level, "href=$link>", $root;
-        push @index, $line;
+        push @mydex, $line;
+        push @seq, $root;
     }
 
@@ -84 +90 @@
         if ($root eq "index") { next; }
         if ($root eq "template") { next; }
+        if ($root eq "sequence") { next; }
 
         # print STDERR "ext: $ext, root: $root\n";
 
         push @docs, $file;
-
+        push @mydirs, "0";
+        
         # simple case: no extra information:
-        $line = sprintf "<tr><td class=doc%d> <a class=dl %-30s  %20s </a></td></tr>", $level, "href=$link>", $root;
+        $line = sprintf "<tr><td class=doc%d> <a class=dl %-30s *%20s </a></td></tr>", $level, "href=$link>", $root;
+        push @mydex, $line;
+        push @seq, &basename ($file);
+    }
+
+    # look for directory sequencing information
+    if (-f "$path/sequence.idx") { 
+        open (FILE, "$path/sequence.idx");
+        @seqline = <FILE>;
+        close (FILE);
+      OUT:
+        for ($i = 0; $i < @seqline; $i++) {
+            $Nmydex = @mydex;
+            chop $seqline[$i];
+          IN:
+            for ($j = 0; $j < $Nmydex; $j++) {
+                $line  = shift @mydex;
+                $value = shift @seq;
+                $dir   = shift @mydirs;
+                if ($seqline[$i] eq $value) {
+                    push @index, $line;
+                    push @dirs, $dir;
+                    # print "ADD SEQ: $dir, $line\n";
+                    next OUT;
+                } else {
+                    push @mydex, $line;
+                    push @mydirs, $dir;
+                    push @seq, $value;
+                }
+            }
+        }       
+    }
+    # add trailing portion of updex here
+    foreach $line (@mydex) {
+        $dir = shift @mydirs;
+        # print "ADD VAL: $dir, $line\n";
+        push @dirs, $dir;
         push @index, $line;
     }
@@ -100 +144 @@
 
     for ($i = 0; $i < @dirs; $i++) {
+        if ($dirs[$i] eq 0) { next; }
         &mksubidx ($dirs[$i], $level + 1, $i + $entry + 1, $template, @index);
     }