Changeset 63 for branches/testa-single-bookmark

Timestamp:

Aug 31, 2019 10:20:18 PM (6 years ago)

Author:

anonymous

Message:

remove php/x.php

Location:

branches/testa-single-bookmark

Files:

• php/content3.php (modified) (8 diffs)
• php/x.php (deleted)
• settings-devconf.yml (modified) (1 diff)

branches/testa-single-bookmark/php/content3.php

@@ -86 +86 @@
     $cmd_line = implode(" " , $cmd_line_items);
 
-    $array = array();
-    $handle = popen( $cmd_line , "r");
-    while (( $buffer = fgets($handle, 4096)) !== false){
-        $line = trim($buffer);
-        $data = explode($top_path,  $line)[1];
-        array_push($array , $data);
-    }
-    if (!feof($handle)) {
-            echo "Error: unexpected fgets() fail\n";
-    }
-    pclose($handle);
+    exec($cmd_line, $results, $ret_code);
     
-    return array( "top_path" => $top_path, "file_list" => $array);
+    if( $ret_code === 0 ){
+        $array = array();
+        foreach($results as $buffer){
+            $line = trim($buffer);
+            $data = explode($top_path,  $line)[1];
+            array_push($array , $data);
+        }
+        $array_x = array( "top_path" => $top_path, "file_list" => $array);
+   }
+    else{
+        $array_x = array( );
+    }
+    return $array_x;
 }
 
@@ -138 +140 @@
     mkdir($dir);
     $path = implode( "/" , array( $dir , $filename) );
-#    echo "path=$path";
     ensure_dir( $dir );
 
@@ -159 +160 @@
     $list = get_site_tsv( $num );
 
-    debug_vd( $list );
-
     $t = $list[$base]["t"];
     $s = $list[$base]["s"];
@@ -174 +173 @@
     $cmd_line = implode(" " , $cmd_line_items);
 
-    $array = array();
-    $handle = popen( $cmd_line , "r");
-
-    while (( $buffer = fgets($handle, 4096)) !== false){
-        $line = trim($buffer);
-        array_push($array , $line);
-    }
-    if (!feof($handle)) {
-            echo "Error: unexpected fgets() fail\n";
-    }
-    pclose($handle);
-
-    $full_download_url = implode( "/" , array( $output_url , $output_html ) );
-
-    $html_fname_tmp = $output_html  . ".tmp";
-    $partial_download_url = implode( "/" , array( $output_url , $html_fname_tmp) );
-
-    $info = array( "full_download_url" => $full_download_url,
+    
+    exec($cmd_line, $results, $ret_code);
+    if( $ret_code === 0 ){
+        $full_download_url = implode( "/" , array( $output_url , $output_html ) );
+
+        $html_fname_tmp = $output_html  . ".tmp";
+        $partial_download_url = implode( "/" , array( $output_url , $html_fname_tmp) );
+
+        $info = array( "full_download_url" => $full_download_url,
                    "partial_download_url" => $partial_download_url );
-
+    }
+    else{
+        $info = array();
+    }
     return $info;
 }
@@ -269 +262 @@
                     }
                     else{
-                        output_file( dirname(__FILE__) . "/debug-F.txt" , "ABCDEFG" );
+#                        output_file( dirname(__FILE__) . "/debug-F.txt" , "ABCDEFG" );
                         $ret = "P-UPLOAD_CONTENT-NO-PATH";
                     }
@@ -290 +283 @@
                     
                 default:
-                    debug_x("P-DEFAULT");
+#                    debug_x("P-DEFAULT");
                     /* $content = "P-DEFAULT";*/
                     break;
@@ -302 +295 @@
     }
     else{
-        debug_x('DEFAULT');
+#        debug_x('DEFAULT');
     }
 
@@ -428 +421 @@
 }
 
+function do_exec(){
+    $cmd = "ls -l /z";
+
+    exec($cmd, $opt, $ret);
+
+#    print_r($opt);
+#    echo "ret=" . $ret . "\n";
+}
+
 cmdx();
+/*
+do_exec();
+*/
 /*
 $num = 0;

branches/testa-single-bookmark/settings-devconf.yml

@@ -1 +1 @@
 -
   url:          https://toppers.jp
-  path:         /var/www/vhosts/devconf.northern-cross.info/httpdocs/c/md2site/_xtest/wtjx/t12/src
-  conf_path:    /var/www/vhosts/devconf.northern-cross.info/httpdocs/c/md2site/_xtest/wtjx/t12/conf
-  output_path:  /var/www/vhosts/devconf.northern-cross.info/httpdocs/c/md2site/_xtest/wtjx/t12/output
-  bundle_path:  /var/www/vhosts/devconf.northern-cross.info/httpdocs/c/md2site
+  path:         /var/www/vhosts/devconf.northern-cross.info/httpdocs/a/c/md2site/_xtest/wtjx/t12/src
+  conf_path:    /var/www/vhosts/devconf.northern-cross.info/httpdocs/a/c/md2site/_xtest/wtjx/t12/conf
+  output_path:  /var/www/vhosts/devconf.northern-cross.info/httpdocs/a/c/md2site/_xtest/wtjx/t12/output
+  bundle_path:  /var/www/vhosts/devconf.northern-cross.info/httpdocs/a/c/md2site
   storage_dir:  storage-devconf
-  output_url:           https://devconf.northern-cross.info/c/md2site/_xtest/wtjx/t12/output
+  output_url:           https://devconf.northern-cross.info/a/c/md2site/_xtest/wtjx/t12/output
 #  full_download_url:    https://devconf.northern-cross.info/c/md2site-web/_xtest/wtjx/t12/output/devconf2018.html
 #  partial_download_url: https://devconf.northern-cross.info/c/md2site-web/_xtest/wtjx/t12/output/devconf2018.html.tmp