X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=webtest%2Fcds_test01.php;h=6156ef17dd095c181bcb522d5a8b891e24723644;hb=2630bbd10b83238863e371681cc7d272e73a3f39;hp=ed005fc846abc1e126efa6d46bcb284cb444799d;hpb=7edbe80f9797346b9950db411461f306d0e4b15d;p=curl-de-sac.git

diff --git a/webtest/cds_test01.php b/webtest/cds_test01.php
index ed005fc..6156ef1 100755
--- a/webtest/cds_test01.php
+++ b/webtest/cds_test01.php
@@ -8,9 +8,9 @@ require_once('Obj/curl-de-sac.phh');
 class short_cmd extends CDS_cmd {
     var $short_data;
 
-    function short_cmd($ch, $cmd_cls, $short_data)
+    function short_cmd($cmd_cls, $ch, $short_data)
     {
-        parent::__construct($ch, $cmd_cls);
+        parent::__construct($cmd_cls, $ch);
         $this->short_data = $short_data;
     }
 }
@@ -23,8 +23,10 @@ class short_cmd_cls extends CDS_cmd_cls {
 
     function create($cds, $url)
     {
-        printf("short::create url:[%s]\n", $url);
-        
+        if ($cds->dbg_get() > 0) {
+            printf("short::create url:[%s]\n", $url);
+        }
+
         do {
             if (($ch = parent::pre_create($url)) == FALSE)
                 break;
@@ -42,16 +44,18 @@ class short_cmd_cls extends CDS_cmd_cls {
 
     function cb()
     {
-        printf("short_cb:\n");
+        if ($this->dbg_get() > 0) {
+            printf("short_cb:\n");
+        }
     }
 }
 
 class long_cmd extends CDS_cmd {
     var $long_data;
 
-    function long_cmd($ch, $cmd_cls, $long_data)
+    function long_cmd($cmd_cls, $ch, $long_data)
     {
-        parent::__construct($ch, $cmd_cls);
+        parent::__construct($cmd_cls, $ch);
         $this->long_data = $long_data;
     }
 }
@@ -64,8 +68,10 @@ class long_cmd_cls extends CDS_cmd_cls {
 
     function create($cds, $url)
     {
-        printf("long::create url:[%s]\n", $url);
-        
+        if ($cds->dbg_get() > 0) {
+            printf("long::create url:[%s]\n", $url);
+        }
+
         do {
             if (($ch = parent::pre_create($url)) == FALSE)
                 break;
@@ -83,7 +89,9 @@ class long_cmd_cls extends CDS_cmd_cls {
 
     function cb()
     {
-        printf("long_cb:\n");
+        if ($this->dbg_get() > 0) {
+            printf("long_cb:\n");
+        }
     }
 }
 
@@ -97,9 +105,9 @@ function main()
     $cmd_cls1 = new short_cmd_cls();
 
     // registrer cds_cmd 1
-    printf("Register CLS1\n");
-    if (($cds->cmd_register($cmd_cls1)) == FALSE) {
-        fprintf(STDERR, "cmd_cls1 registration failed\n");
+    printf("MAIN: Register CLS1\n");
+    if (($cds->cmd_cls_register($cmd_cls1)) == FALSE) {
+        fprintf(STDERR, "MAIN: cmd_cls1 registration failed\n");
         exit(1);
     }
 
@@ -107,64 +115,67 @@ function main()
     $cmd_cls2 = new long_cmd_cls();
 
     // register cds_cmd 2
-    printf("Register CLS2\n");
-    if (($cds->cmd_register($cmd_cls2)) == FALSE) {
-        fprintf(STDERR, "cmd_cls2 registration failed\n");
+    printf("MAIN: Register CLS2\n");
+    if (($cds->cmd_cls_register($cmd_cls2)) == FALSE) {
+        fprintf(STDERR, "MAIN: cmd_cls2 registration failed\n");
         exit(2);
     }
 
     // register cds_cmd 2 (retry)
-    printf("Re-register CLS2 (must go wrong)\n");
-    if (($cds->cmd_register($cmd_cls2)) != FALSE) {
-        fprintf(STDERR, "cmd_cls2 re-registration success\n");
+    printf("MAIN: Re-register CLS2 (must go wrong)\n");
+    if (($cds->cmd_cls_register($cmd_cls2)) != FALSE) {
+        fprintf(STDERR, "MAIN: cmd_cls2 re-registration success\n");
         exit(3);
     }
 
+    printf("MAIN: CDS:\n");
     print_r($cds);
-    printf("Deregister CLS2\n");
-    if (($cds->cmd_deregister($cmd_cls2)) == FALSE) {
-        fprintf(STDERR, "cmd_cls2 deregistration failed\n");
+    printf("MAIN: Deregister CLS2\n");
+    if (($cds->cmd_cls_deregister($cmd_cls2)) == FALSE) {
+        fprintf(STDERR, "MAIN: cmd_cls2 deregistration failed\n");
         exit(4);
     }
+    printf("MAIN: CDS:\n");
     print_r($cds);
 
     // re-re-register cds_cmd 2
-    printf("Re-re-register CLS2\n");
-    if (($cds->cmd_register($cmd_cls2)) == FALSE) {
-        fprintf(STDERR, "cmd_cls2 re-re-registration failed\n");
+    printf("MAIN: Re-re-register CLS2\n");
+    if (($cds->cmd_cls_register($cmd_cls2)) == FALSE) {
+        fprintf(STDERR, "MAIN: cmd_cls2 re-re-registration failed\n");
         exit(5);
     }
 
-    printf("Deregister all\n");
-    $cds->cmd_deregister_all();
+    printf("MAIN: Deregister all\n");
+    $cds->cmd_cls_deregister_all();
 
     // registrer cds_cmd 1
-    printf("Register CLS1\n");
-    if (($cds->cmd_register($cmd_cls1)) == FALSE) {
-        fprintf(STDERR, "cmd_cls1 registration failed\n");
+    printf("MAIN: register CLS1\n");
+    if (($cds->cmd_cls_register($cmd_cls1)) == FALSE) {
+        fprintf(STDERR, "MAIN: cmd_cls1 registration failed\n");
         exit(1);
     }
 
     // register cds_cmd 2
-    printf("Register CLS2\n");
-    if (($cds->cmd_register($cmd_cls2)) == FALSE) {
-        fprintf(STDERR, "cmd_cls2 registration failed\n");
+    printf("MAIN: register CLS2\n");
+    if (($cds->cmd_cls_register($cmd_cls2)) == FALSE) {
+        fprintf(STDERR, "MAIN: cmd_cls2 registration failed\n");
         exit(2);
     }
+    printf("MAIN: CDS:\n");
     print_r($cds);
-    printf("SUCCESS\n");
+    printf("MAIN: SUCCESS\n");
 
     for ($i = 0 ; $i < 10 ; $i++) {
         if ($i == 2) {
-            print("load short\n");
+            printf("MAIN: load short\n");
             if ($cds->execute("short", WEBURL.'/short.php') == FALSE) {
-                printf("push command failed\n");
+                printf("MAIN: push command failed\n");
                 exit(123);
             }
         }
-        printf("Call process\n");
+        printf("MAIN: Call process\n");
         $cds->process();
-        sleep(1);
+        usleep(500000);
     }
     // start loop
     //   print status