Changeset 34609 for branches/eam_branches/ipp-20120905/dvodist/www-util/ipp.php

Timestamp:

Oct 25, 2012, 2:15:33 PM (14 years ago)

Author:

eugene

Message:

finish split out of dvodist and ippdata

File:

• branches/eam_branches/ipp-20120905/dvodist/www-util/ipp.php (modified) (7 diffs)

branches/eam_branches/ipp-20120905/dvodist/www-util/ipp.php

@@ -1 +1 @@
 <?php
 
-global $realroot;
-$realroot = "/dvodist";
+global $rootdir;
 
 function head ($title) {
@@ -77 +76 @@
     } 
 
-    global $realroot;
+    global $rootdir;
 
     // hi-lite the current page (use select-style, not style)
     $thisname = $_SERVER[SCRIPT_NAME]; 
-    $page = $realroot . $base;
+    $page = $rootdir . $base;
     if ($page == $thisname) {
       $style = trim($line[1]);
@@ -121 +120 @@
 
 function dirlist ($source) {
+  if (!file_exists($source)) return;
+
   $file = fopen ($source, "r");
   echo "<table class=\"dirlist\">\n";
@@ -139 +140 @@
     // }
 
-    if (count($line) != 4) continue;
-
-    $name  = trim($line[0]);
-    $type  = trim($line[1]);
-    $style = trim($line[2]);
-    $info  = trim($line[3]);
+    if ((count($line) != 4) && (count($line) != 5)) continue;
+
+    // support both the old and new style tables:
+    // old: name | type | style | info
+    // new: name | link | type | style | info
+
+    if (count($line) == 4) {
+      echo "count = 4<br>\n";
+      $name  = trim($line[0]);
+      $type  = trim($line[1]);
+      $style = trim($line[2]);
+      $info  = trim($line[3]);
+      $link  = $name;
+    }
+    if (count($line) == 5) {
+      echo "count = 5<br>\n";
+      $name  = trim($line[0]);
+      $link  = trim($line[1]);
+      $type  = trim($line[2]);
+      $style = trim($line[3]);
+      $info  = trim($line[4]);
+    }
 
     switch ($type) { 
@@ -172 +189 @@
     if (ereg ('^[:blank:]*#', $line[0])) continue;
     if (count($line) < 2) continue;
-    if (count($line) != 4) continue;
-
-    $name  = trim($line[0]);
-    $type  = trim($line[1]);
-    $style = trim($line[2]);
-    $info  = trim($line[3]);
+
+    if ((count($line) != 4) && (count($line) != 5)) continue;
+
+    // support both the old and new style tables:
+    // old: name | type | style | info
+    // new: name | link | type | style | info
+
+    if (count($line) == 4) {
+      $name  = trim($line[0]);
+      $type  = trim($line[1]);
+      $style = trim($line[2]);
+      $info  = trim($line[3]);
+      $link  = $name;
+    }
+    if (count($line) == 5) {
+      $name  = trim($line[0]);
+      $link  = trim($line[1]);
+      $type  = trim($line[2]);
+      $style = trim($line[3]);
+      $info  = trim($line[4]);
+    }
 
     switch ($type) { 
@@ -195 +227 @@
 
 function verbatim ($source) {
+  if (!file_exists($source)) return;
+
   $file = fopen ($source, "r");
 
@@ -218 +252 @@
 // lines which start with @ are processed by 'dirlist', all others are processed by Markdown
 function do_markdown ($source) {
+  if (!file_exists($source)) return;
+
   $file = fopen ($source, "r");