Changeset 6148

Timestamp:

19/08/09 16:22:36 (3 years ago)

Author:

westram

Message:

• use pointer AWAR in DB scanner (fixes #211)

Files:

• trunk/SL/DB_SCANNER/db_scanner.cxx (modified) (13 diffs)

trunk/SL/DB_SCANNER/db_scanner.cxx

@@ -40 +40 @@
     cbs->may_be_an_error = 0;
     GB_push_transaction(cbs->gb_main);
-    GBDATA *gbd = (GBDATA *)aw_root->awar(cbs->def_gbd)->read_int();
+    GBDATA *gbd = (GBDATA *)aw_root->awar(cbs->def_gbd)->read_pointer();
     if (    !cbs->gb_user ||
             !gbd ||
@@ -134 +134 @@
                 else    error      = GB_write_as_string(gb_new,value);
 
-                cbs->aws->get_root()->awar(cbs->def_gbd)->write_int((long)gb_new); // remap arbdb
+                cbs->aws->get_root()->awar(cbs->def_gbd)->write_pointer(gb_new); // remap arbdb
             }
         }
@@ -195 +195 @@
                         error = GB_delete(gbd);
                         if (!error) {
-                            cbs->aws->get_root()->awar(cbs->def_gbd)->write_int((long) gb_key);
+                            cbs->aws->get_root()->awar(cbs->def_gbd)->write_pointer(gb_key);
                         }
                     }
@@ -250 +250 @@
     GB_push_transaction(cbs->gb_main);
     if (cbs->may_be_an_error) {     // sorry
-        cbs->aws->get_root()->awar(cbs->def_gbd)->write_int((long)0);
-    }
-    gbd = (GBDATA *)cbs->aws->get_root()->awar(cbs->def_gbd)->read_int();
+        cbs->aws->get_root()->awar(cbs->def_gbd)->write_pointer(NULL);
+    }
+    gbd = (GBDATA *)cbs->aws->get_root()->awar(cbs->def_gbd)->read_pointer();
 
     if (cbs->gb_edit) {
@@ -301 +301 @@
     sprintf(buffer,"tmp/arbdb_scanner_%i/list",scanner_id);
     cbs->def_gbd = strdup(buffer);
-    aw_root->awar_int( cbs->def_gbd, 0, AW_ROOT_DEFAULT);
+    aw_root->awar_pointer(cbs->def_gbd, 0, AW_ROOT_DEFAULT);
 
     sprintf(buffer,"tmp/arbdb_scanner_%i/find",scanner_id);
@@ -317 +317 @@
     aws->at(box_pos_fig);
 
-    cbs->id          = aws->create_selection_list(cbs->def_gbd,0,"",20,10);
+    cbs->id          = aws->create_selection_list(cbs->def_gbd, 0, "", 20, 10);
     cbs->aws         = aws;
     cbs->awr         = aw_root;
@@ -386 +386 @@
         case GB_DB: {
             GBS_strcat(out, "<CONTAINER>:");
-            cbs->aws->insert_selection(cbs->id, GBS_mempntr(out), (long)gbd);
+            cbs->aws->insert_selection(cbs->id, GBS_mempntr(out), gbd);
             GBS_strforget(out);
 
@@ -396 +396 @@
         case GB_LINK: {
             GBS_strnprintf(out, 100, "LINK TO '%s'", GB_read_link_pntr(gbd));
-            cbs->aws->insert_selection(cbs->id, GBS_mempntr(out), (long)gbd);
+            cbs->aws->insert_selection(cbs->id, GBS_mempntr(out), gbd);
             GBS_strforget(out);
 
@@ -417 +417 @@
                 GBS_strcat(out, "<unprintable>");
             }
-            cbs->aws->insert_selection(cbs->id, GBS_mempntr(out), (long)gbd);
+            cbs->aws->insert_selection(cbs->id, GBS_mempntr(out), gbd);
             GBS_strforget(out);
             break;
@@ -492 +492 @@
                         }
                     }
-                    cbs->aws->insert_selection( cbs->id, buffer, (long)gbd );
+                    cbs->aws->insert_selection(cbs->id, buffer, gbd);
                 }
                 else { // non-existing entry
-                    p[0]=' '; p[1] = ':'; p[2] = 0;
-                    cbs->aws->insert_selection( cbs->id, buffer, (long)gb_key );
+                    p[0] = ' '; p[1] = ':'; p[2] = 0;
+                    cbs->aws->insert_selection(cbs->id, buffer, gb_key);
                 }
             }
@@ -538 +538 @@
         }
     }
-    aws->insert_default_selection( cbs->id, "", (long)0 );
+    aws->insert_default_selection( cbs->id, "", (void*)NULL);
     aws->update_selection_list( cbs->id );
     if (cbs->gb_user) {
@@ -551 +551 @@
 static void awt_scanner_changed_cb2(GBDATA *dummy, struct adawcbstruct *cbs, GB_CB_TYPE gbtype)
 {
-    cbs->aws->get_root()->awar(cbs->def_gbd)->write_int((long)0);
+    cbs->aws->get_root()->awar(cbs->def_gbd)->write_pointer(NULL);
     // unmap edit field
     awt_scanner_changed_cb(dummy,cbs,gbtype);
@@ -579 +579 @@
     }
 
-    cbs->aws->get_root()->awar(cbs->def_gbd)->write_int((long)0);
+    cbs->aws->get_root()->awar(cbs->def_gbd)->write_pointer(NULL);
     awt_scanner_changed_cb(gb_pntr,cbs,GB_CB_CHANGED);