cvs: /php3/functions hg_comm.c hw.c /php3/tests hyperwave.php3

steinm Tue Oct 26 05:18:35 1999 EDT Modified files: /php3/functions hg_comm.c hw.c /php3/tests hyperwave.php3 Log: - fixed bug which causes php3 to die in hw_objrec2array() - fixed call to hw_mapid() in test script Index: php3/functions/hg_comm.c diff -u php3/functions/hg_comm.c:1.31 php3/functions/hg_comm.c:1.32 --- php3/functions/hg_comm.c:1.31 Thu Oct 21 11:17:11 1999 +++ php3/functions/hg_comm.c Tue Oct 26 05:18:32 1999 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hg_comm.c,v 1.31 1999/10/21 15:17:11 steinm Exp $ */ +/* $Id: hg_comm.c,v 1.32 1999/10/26 09:18:32 steinm Exp $ */ /* #define HW_DEBUG */ @@ -75,7 +75,7 @@ static int swap(int val); -int version = VERSION; +/*int version = VERSION; */ /* F_DISTRIBUTED has the effect that all object ids are virtual. This means whenever an object is requested a new id is generated for this session. Wavemaster and @@ -84,7 +84,7 @@ need to allow access on other server through the local server. The hw_mapid() function won't work unless you set F_DISTRIBUTED */ -/* int version = VERSION | F_DISTRIBUTED; */ + int version = VERSION | F_DISTRIBUTED; /* int version = VERSION | F_DISTRIBUTED | F_COMPRESSED; */ static int msgid = 1; static int sock_flags = -1; Index: php3/functions/hw.c diff -u php3/functions/hw.c:1.50 php3/functions/hw.c:1.51 --- php3/functions/hw.c:1.50 Thu Oct 21 11:17:11 1999 +++ php3/functions/hw.c Tue Oct 26 05:18:32 1999 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.50 1999/10/21 15:17:11 steinm Exp $ */ +/* $Id: hw.c,v 1.51 1999/10/26 09:18:32 steinm Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" @@ -275,6 +275,7 @@ iTitle = 0; iDesc = 0; iKeyword = 0; + iGroup = 0; if(0 == strncmp(attrname, "Title=", 6)) { if ((hasTitle == 0) && (array_init(&title_arr) == FAILURE)) { return -1; @@ -322,7 +323,7 @@ } else if(iGroup) { if(iGroup) add_next_index_string(&group_arr, str, 1); - } + } attrname = strtok(NULL, "\n"); } Index: php3/tests/hyperwave.php3 diff -u php3/tests/hyperwave.php3:1.3 php3/tests/hyperwave.php3:1.4 --- php3/tests/hyperwave.php3:1.3 Thu Oct 21 11:17:11 1999 +++ php3/tests/hyperwave.php3 Tue Oct 26 05:18:34 1999 @@ -78,7 +78,7 @@ echo "\n"; echo "Test 4: Map rootcollection on remote server and list children.\n"; - $rootid = hw_mapid(hexdec("0x82d85c03"), hexdec("0x00000002")); + $rootid = hw_mapid($connect, hexdec("0x82d85c03"), hexdec("0x00000002")); $rootchildobjrecs = hw_childrenobj($connect, $rootid); list_children($rootchildobjrecs); echo "Test 4: successful\n";