From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Mon, 7 Mar 2016 04:03:45 +0000 (+0000)
Subject: Bed !
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=9b6b521c7eef2b001dbb02526e81f2556054df4b;p=nb.git

Bed !
---

diff --git a/lib/php/db.php b/lib/php/db.php
index b61bcbe1..af9e3a95 100644
--- a/lib/php/db.php
+++ b/lib/php/db.php
@@ -509,6 +509,7 @@ EOF;
         array('db.count','Tables count(*)'),
         array('[db.]html_menu','Html menu for tables with links'),
 
+        array('[table.]rows','Dump one table, use format='),
         array('[table.]fields','List fields'),
         array('table.count','Table count(*)'),
         array('table.sql','Get the sql source'),
diff --git a/lib/php/db/table.php b/lib/php/db/table.php
index b4a14e4c..0e0fd1b6 100644
--- a/lib/php/db/table.php
+++ b/lib/php/db/table.php
@@ -757,15 +757,15 @@ FROM pg_catalog.pg_attribute a WHERE a.attrelid = (SELECT c.oid FROM pg_catalog.
   -----------------------------------------------------------------*/
   function rows_begin_xml() {
     return ''
-      .'<?xml version=“1.0” encoding=“utf-8”?>'.PHP_EOL #<?
+      .'<?xml version="1.0" encoding="utf-8"?>'.PHP_EOL #<?
       #.'<database name="'.$this->db->name.'" table="'.$this->name.'" type="'.$this->db->type.'">'.PHP_EOL
-      .'<table name="'.$this->name.'" database="'.$this->db->name.'" database-type="'.$this->db->type.'">'.PHP_EOL
+      .'<rows name="'.$this->name.'" database="'.$this->db->name.'" database-type="'.$this->db->type.'">'.PHP_EOL
     ;
   }
 
   function rows_rec_xml(&$row) {
     $xml = '';
-    $xml .= "\t<rec>".PHP_EOL;
+    $xml .= "\t<row>".PHP_EOL;
     foreach ($row as $k=>$v) {
       if ($v !== '') $xml .= ''
         . "\t\t<".$k.">"
@@ -773,12 +773,12 @@ FROM pg_catalog.pg_attribute a WHERE a.attrelid = (SELECT c.oid FROM pg_catalog.
         . '</'.$k.'>'
       .PHP_EOL;
     }
-    $xml .= "\t</rec>".PHP_EOL;
+    $xml .= "\t</row>".PHP_EOL;
     return $xml;
   }
 
   function rows_end_xml() {
-    return '</table>'.PHP_EOL;
+    return '</rows>'.PHP_EOL;
   }
 
   /*-----------------------------------------------------------------
@@ -1024,6 +1024,7 @@ FROM pg_catalog.pg_attribute a WHERE a.attrelid = (SELECT c.oid FROM pg_catalog.
 
     } elseif ($action == 'table.rows' or $action == 'rows') {
       #if ($this->p('page')==='0') $this->pset('inc',1);
+      $this->db->print_header($this->p('format'));
       $this->rows(); return true;
 
 # NB 06.03.16     } elseif ($action == 'table') {
diff --git a/lib/php/out.php b/lib/php/out.php
index c28c0551..987a61a4 100644
--- a/lib/php/out.php
+++ b/lib/php/out.php
@@ -18,6 +18,13 @@ class Out extends Nb {
         'head' => 'out_csv_head',
         'function' => 'out_csv',
       ),
+      'labels' => array(
+        'enclose' => array("<center>".OUT_EOL,"</center>"),
+        'tag_enclose' => 'labels',
+        'tag' => 'label',
+        'function' => 'out_tag',
+        'head' => 'out_tag_head',
+      ),
       'table' => array(
         'enclose' => array("<table>".OUT_EOL,"</table>"),
         'tag_enclose' => 'tr',
@@ -148,7 +155,7 @@ function out_csv_head(&$row,$o) {
 #function out_tag_head(&$row,$o) { return ''; }
 function out_tag_head(&$data,$o) {
   #return var_dump($row,true); return '';
-  $o['tag'] = $o['tag_head'];
+  $o['tag'] = isset($o['tag_head']) ? $o['tag_head'] : $o['tag'];
   $row = out::ar_first($data);
   if (!out::is_hash($row)) $row = $data;
   #if (!is_array($row)) return out_csv(array_fill(0,count($row),'?'));