Cleaning up samples

author: Silvio <silvio@devlet.com.br> 2010-08-18 12:22:55 -0300
committer: Silvio <silvio@devlet.com.br> 2010-08-18 12:22:55 -0300
commit: e949696dd9ba44b2bc3ad703d9704ed1d47a6d8f (patch)
tree: 5107b8a0e1983d8069f331af185f988d83792ace
parent: 38eb563bc42fb1ab830fd27277aefe7f04937ee5 (diff)
download: cinisis-e949696dd9ba44b2bc3ad703d9704ed1d47a6d8f.tar.gz
cinisis-e949696dd9ba44b2bc3ad703d9704ed1d47a6d8f.tar.bz2
4 files changed, 214 insertions, 200 deletions
diff --git a/classes/helpers/CinisisDisplayHelper.php b/classes/helpers/CinisisDisplayHelper.php
index e5cbafe..4988c3e 100644
--- a/classes/helpers/CinisisDisplayHelper.php
+++ b/classes/helpers/CinisisDisplayHelper.php
@@ -150,4 +150,45 @@ class CinisisDisplayHelper {
   static function entry_link($entry) {
     return self::link('index.php', '?entry='. $entry, $entry);
   }
+
+  /**
+   * Draws tags for opening a table.
+   */
+  static function open_table() {
+    echo '<table><tr>';
+  }
+
+  /**
+   * Draws tags for closing a table.
+   */
+  static function close_table() {
+    echo '</tr></table>';
+  }
+
+  /**
+   * Draws a h2 element.
+   *
+   * @param $text
+   *   Inner text.
+   */
+  static function h2($text) {
+    echo "<h2>$text</h2>";
+  }
+
+  /**
+   * Draws a h3 element.
+   *
+   * @param $text
+   *   Inner text.
+   */
+  static function h3($text) {
+    echo "<h3>$text</h3>";
+  }
+
+  /**
+   * Draws a line break element.
+   */
+  static function h3($text) {
+    echo "<br />";
+  }
 }
diff --git a/samples/malete.php b/samples/malete.php
index 03451f2..322856a 100644
--- a/samples/malete.php
+++ b/samples/malete.php
@@ -1,181 +1,158 @@
 <?php
 /**
- * Test query script.
+ * Malete test script.
  */
 
-// Import Malete Library
-require 'contrib/malete/php/Isis.php';
+// Import requisites.
+require_once '../index.php';
+require_once 'contrib/malete/php/Isis.php';
 
-?>
-
-<html><head><title>Query</title></head><body>
-
-<?php
+// Draw the document.
+$display = new CinisisDisplayHelper('Malete Test');
 	
-  // Create a db with field list ("fdt")
-  $fdt_anu10 = array(
-		  'Periodico'            =>  1,
-		  'Data'                 =>  2,
-		  'Titulo'               =>  3,
-		  'Autor'                =>  4,
-		  'Assuntos primarios'   =>  5,
-		  'Assuntos secundarios' =>  6,
-		  'Ilustrado'            =>  7,
-		  'Caderno'              =>  8,
-		  'Pagina'               =>  9,
-		  'Arquivo digital'      => 10,
-		  'Forma documento'      => 11,
-		  'Local de publicacao'  => 12,
-		  'Observacoes'          => 13,
-		  'Descritores imagem'   => 14,
-		  'Termo geografico'     => 16,
-		  'Coluna'               => 17,
-		  'Recorte'              => 19,
-		  'Alimentador'          => 20,
-		  'Tema Anuario'         => 21,
-    );
-
-  $fdt_tupi = array(
-		  'cod.titulo'                  => 1,
-		  'postopo'                     => 2,
-		  'num.entrada'                 => 3,
-		  'num.tombo'                   => 4,
-		  'datain'                      => 5,
-		  'dataex'                      => 6,
-		  'acervo (DIF ou PRE)'         => 7,
-		  'cadarq'                      => 10,
-		  'caddep'                      => 11,
-		  'cadddl'                      => 12,
-		  'outarq'                      => 13,
-		  'categorias'                  => 15,
-		  'presok'                      => 16,
-		  'roteiro de locução'          => 17,
-		  'mat.acervo'                  => 18,
-		  'mat.orig'                    => 19,
-		  'titulo'                      => 20,
-		  'outros titulos'              => 22,
-		  'data/série'                  => 24,
-		  'conteudo/sinopse'            => 25,
-		  'descritores'                 => 26,
-		  'descritores secundários'     => 27,
-		  'identidades'                 => 28,
-		  'ndxlib'                      => 29,
-		  'materiais'                   => 40,
-		  'materiais'                   => 41,
-		  'materiais'                   => 42,
-		  'materiais'                   => 43,
-		  'materiais'                   => 44,
-		  'materiais'                   => 45,
-		  'mat'                         => 46,
-		  'mat'                         => 47,
-		  'mat'                         => 48,
-		  'mat'                         => 49,
-		  'mat'                         => 50,
-		  'mat'                         => 51,
-		  'mat'                         => 52,
-		  'mat'                         => 53,
-		  'mat'                         => 54,
-		  'mat'                         => 55,
-		  'evol.estado tec.'            => 56,
-		  'movimentacao'                => 57,
-		  'movimentacao'                => 58,
-		  'obsmat'                      => 59,
-		  'producao*'                   => 60,
-		  'dir.arte*'                   => 61,
-		  'fotografia*'                 => 62,
-		  'musica*'                     => 63,
-		  'som*'                        => 64,
-		  'montagem*'                   => 65,
-		  'direcao*'                    => 66,
-		  'arg/roteiro*'                => 67,
-		  'distribuicao*'               => 68,
-		  'colab./outros'               => 69,
-		  'producao1'                   => 70,
-		  'dir.arte1'                   => 71,
-		  'fotografia1'                 => 72,
-		  'musica1'                     => 73,
-		  'som1'                        => 74,
-		  'montagem1'                   => 75,
-		  'producao2(res.p/expandir)'   => 80,
-		  'dir.arte2(res.p/expandir)'   => 81,
-		  'fotografia2(res.p/expandir)' => 82,
-		  'musica2(res.p/expandir)'     => 83,
-		  'som2(res.p/expandir)'        => 84,
-		  'loc.prod.lan'                => 85,
-		  'dat.prod.lan'                => 86,
-		  'lab/est/locacoes'            => 87,
-		  'premios'                     => 88,
-		  'fontes'                      => 89,
-		  'certificados'                => 95,
-		  'examinador'                  => 98,
-		  'observações'                 => 99,
-		  'termos geográficos'          => 165,
-		  'quicktime'                   => 900,
-		  'revisão'                     => 901,
-		  'vídeo'                       => 902,
-    );
-
-  //$db   = 'tupi';
-  $db   = 'anu10';
-  $fdt  = ${'fdt_'. $db};
-?>
-
-<h2>server</h2>
-
-<?php
-  $db = new Isis_Db($fdt, $db, new Isis_Server());
-  if (!$db->srv->sock) {
-    echo "could not contact server\n";
+// Create a db with field list ("fdt")
+$fdt_anu10 = array(
+  'Periodico'            =>  1,
+  'Data'                 =>  2,
+  'Titulo'               =>  3,
+  'Autor'                =>  4,
+  'Assuntos primarios'   =>  5,
+  'Assuntos secundarios' =>  6,
+  'Ilustrado'            =>  7,
+  'Caderno'              =>  8,
+  'Pagina'               =>  9,
+  'Arquivo digital'      => 10,
+  'Forma documento'      => 11,
+  'Local de publicacao'  => 12,
+  'Observacoes'          => 13,
+  'Descritores imagem'   => 14,
+  'Termo geografico'     => 16,
+  'Coluna'               => 17,
+  'Recorte'              => 19,
+  'Alimentador'          => 20,
+  'Tema Anuario'         => 21,
+);
+
+$fdt_tupi = array(
+  'cod.titulo'                  => 1,
+  'postopo'                     => 2,
+  'num.entrada'                 => 3,
+  'num.tombo'                   => 4,
+  'datain'                      => 5,
+  'dataex'                      => 6,
+  'acervo (DIF ou PRE)'         => 7,
+  'cadarq'                      => 10,
+  'caddep'                      => 11,
+  'cadddl'                      => 12,
+  'outarq'                      => 13,
+  'categorias'                  => 15,
+  'presok'                      => 16,
+  'roteiro de locução'          => 17,
+  'mat.acervo'                  => 18,
+  'mat.orig'                    => 19,
+  'titulo'                      => 20,
+  'outros titulos'              => 22,
+  'data/série'                  => 24,
+  'conteudo/sinopse'            => 25,
+  'descritores'                 => 26,
+  'descritores secundários'     => 27,
+  'identidades'                 => 28,
+  'ndxlib'                      => 29,
+  'materiais'                   => 40,
+  'materiais'                   => 41,
+  'materiais'                   => 42,
+  'materiais'                   => 43,
+  'materiais'                   => 44,
+  'materiais'                   => 45,
+  'mat'                         => 46,
+  'mat'                         => 47,
+  'mat'                         => 48,
+  'mat'                         => 49,
+  'mat'                         => 50,
+  'mat'                         => 51,
+  'mat'                         => 52,
+  'mat'                         => 53,
+  'mat'                         => 54,
+  'mat'                         => 55,
+  'evol.estado tec.'            => 56,
+  'movimentacao'                => 57,
+  'movimentacao'                => 58,
+  'obsmat'                      => 59,
+  'producao*'                   => 60,
+  'dir.arte*'                   => 61,
+  'fotografia*'                 => 62,
+  'musica*'                     => 63,
+  'som*'                        => 64,
+  'montagem*'                   => 65,
+  'direcao*'                    => 66,
+  'arg/roteiro*'                => 67,
+  'distribuicao*'               => 68,
+  'colab./outros'               => 69,
+  'producao1'                   => 70,
+  'dir.arte1'                   => 71,
+  'fotografia1'                 => 72,
+  'musica1'                     => 73,
+  'som1'                        => 74,
+  'montagem1'                   => 75,
+  'producao2(res.p/expandir)'   => 80,
+  'dir.arte2(res.p/expandir)'   => 81,
+  'fotografia2(res.p/expandir)' => 82,
+  'musica2(res.p/expandir)'     => 83,
+  'som2(res.p/expandir)'        => 84,
+  'loc.prod.lan'                => 85,
+  'dat.prod.lan'                => 86,
+  'lab/est/locacoes'            => 87,
+  'premios'                     => 88,
+  'fontes'                      => 89,
+  'certificados'                => 95,
+  'examinador'                  => 98,
+  'observações'                 => 99,
+  'termos geográficos'          => 165,
+  'quicktime'                   => 900,
+  'revisão'                     => 901,
+  'vídeo'                       => 902,
+);
+
+// Database connection setup.
+$db  = 'anu10';
+$fdt = ${'fdt_'. $db};
+$db  = new Isis_Db($fdt, $db, new Isis_Server());
+
+$display->h2('Server');
+
+if (!$db->srv->sock) {
+  echo "could not contact server\n";
+}
+else {
+  $display->h3("Number of records");
+  $query = 'HORA';
+  $recs  = $db->num_recs($query);
+  echo "Got ". count($recs) ." terms for '$query'</br>\n";
+
+  $display->h3("Terms beginning with...");
+  $query = 'Hora';
+  $terms = $db->terms(strtoupper($query));
+  echo "Got ". count($terms) ." terms for '$query'</br>\n";
+
+  foreach ($terms as $t) {
+    list($cnt, $term) = explode("\t", $t);
+    echo "'$term'($cnt) ";
   }
-  else {
-    //print_r($db);
-?>
-
-<h3>number of records...</h3>
 
-<?php
-    $query = 'HORA';
-    $recs  = $db->num_recs($query);
-    echo "got ",count($recs), " terms for '$query'</br>\n";
-?>
-
-<h3>terms beginning with...</h3>
+  $display->br();
+  $display->h3('Query reading records');
+  $query = 'Corumbiara';
+  $recs  = $db->query(strtoupper($query));
 
-<?php
-    $query = 'Hora';
-    $terms = $db->terms(strtoupper($query));
-    echo "got ",count($terms), " terms for '$query'</br>\n";
-    foreach ($terms as $t) {
-      list($cnt, $term) = explode("\t", $t);
-      echo "'$term'($cnt) ";
-    }
-    echo "</br>\n";
-?>
+  echo "Got ". count($recs) ." records for '$query'</br>\n";
 
-<h3>query reading records</h3>
-
-<?php
-    $query = 'Corumbiara';
-    $recs  = $db->query(strtoupper($query));
-    echo "got ",count($recs), " records for '$query'</br>\n";
-    foreach ($recs as $r) {
-      echo "<pre>---\n", $r->toString(), "---\n</pre>\n";
-    }
-?>
-
-<h3>query reading a record</h3>
-
-<?php
-    $r = $db->read(6);
-    echo "<pre>---\n", $r->toString(), "---\n</pre><br>\n";
-    echo '<pre>';
-    //print_r($r);
-    //print_r($r->val[8]);
-    //print_r(preg_split('/\t/', $r->val[7]));
-    //print_r(array_flip($fdt_anu10));
-    echo '</pre>';
-  } // end else could contact server
+  foreach ($recs as $r) {
+    echo "<pre>---\n", $r->toString(), "---\n</pre>\n";
+  }
 
-?>
+  $display->h3('Query reading a record');
+  $r = $db->read(6);
+  echo "<pre>---\n", $r->toString(), "---\n</pre><br>\n";
+}
 
-</body></html>
+$display->footer();
diff --git a/samples/phpisis.php b/samples/phpisis.php
index 75326f1..cc691d6 100644
--- a/samples/phpisis.php
+++ b/samples/phpisis.php
@@ -1,29 +1,31 @@
 <?php
 /**
- * Test query script.
+ * Php Isis test script.
  */
-?>
 
-<h3>Testing pecl-isis</h3>
-<?php
+// Import requisites.
+require_once '../index.php';
+
+// Draw the document.
+$display = new CinisisDisplayHelper('Php Isis Test');
 
-  $db = isis_open('db/dbname/dbname');
-  print_r(isis_last_mfn($db));
+// Open the database.
+$db = isis_open('db/dbname/dbname');
+print_r(isis_last_mfn($db));
 
-  echo '<table>';
+$display->open_table();
 
-  $result = isis_search('$', $db);
-  while ($record = isis_fetch_flat_array($result) ) {
-    print (" <tr><td colspan=\"2\">MFN: $record[mfn]</td></tr>\n");
-    for ($i=0; $i<count($record)-1; ++$i) { //-1 porque el mfn es +1
-      list ($tag, $value) = $record[$i];
-      print (" <tr>\n".
-        " <td>$tag</td>\n".
-        " <td>".htmlspecialchars($value)."</td>\n".
-        " </tr>\n");
-    }
+$result = isis_search('$', $db);
+while ($record = isis_fetch_flat_array($result) ) {
+  print (" <tr><td colspan=\"2\">MFN: $record[mfn]</td></tr>\n");
+  for ($i=0; $i<count($record)-1; ++$i) { //-1 porque el mfn es +1
+    list ($tag, $value) = $record[$i];
+    print (" <tr>\n".
+      " <td>$tag</td>\n".
+      " <td>".htmlspecialchars($value)."</td>\n".
+      " </tr>\n");
   }
-  echo '</table>';
-?>
+}
 
-</body></html>
+$display->close_table();
+$display->footer();
diff --git a/samples/read.php b/samples/read.php
index 835ae60..5a5be04 100644
--- a/samples/read.php
+++ b/samples/read.php
@@ -8,21 +8,17 @@ require_once '../index.php';
 
 // Draw the document.
 $display = new CinisisDisplayHelper('Isis Reader');
-?>
-
-<table><tr>
-
-<?php
+$display->open_table();
 
 $configs = array(
   0 => array(
     'implementation' => 'PhpIsis',
     'database'       => 'dbname',
-    ),
+  ),
   1 => array(
     'implementation' => 'BiblioIsis',
     'database'       => 'dbname',
-    ),
+  ),
 );
 
 foreach ($configs as $config) {
@@ -45,7 +41,5 @@ foreach ($configs as $config) {
   }
 }
 
-?>
-
-</tr></table>
-</body>
+$display->close_table();
+$display->footer();
author	Silvio <silvio@devlet.com.br>	2010-08-18 12:22:55 -0300
committer	Silvio <silvio@devlet.com.br>	2010-08-18 12:22:55 -0300
commit	e949696dd9ba44b2bc3ad703d9704ed1d47a6d8f (patch)
tree	5107b8a0e1983d8069f331af185f988d83792ace
parent	38eb563bc42fb1ab830fd27277aefe7f04937ee5 (diff)
download	cinisis-e949696dd9ba44b2bc3ad703d9704ed1d47a6d8f.tar.gz cinisis-e949696dd9ba44b2bc3ad703d9704ed1d47a6d8f.tar.bz2