Changeset 93 for trunk/test/src/RpLibraryC_test.c

Timestamp:

Oct 6, 2005 3:33:41 PM (18 years ago)

Author:

dkearney

Message:

1. corrected c interface language binding function names so they are

consistant with previous c interface function names

2. separated object dictionaries from fortran code, placed them in

the RpBindings.[h,cc] files so matlab bindings can use them too.

3. adjusted makefile to compile RpBindings code

File:

• trunk/test/src/RpLibraryC_test.c (modified) (10 diffs)

trunk/test/src/RpLibraryC_test.c

@@ -28 +28 @@
     printf("TESTING ELEMENT: path = %s\n", path);
 
-    searchEle = element(lib,path);
-    type = elementAsType(lib,path);
-    comp = elementAsComp(lib,path);
-    id = elementAsId(lib,path);
+    searchEle = rpElement(lib,path);
+    type = rpElementAsType(lib,path);
+    comp = rpElementAsComp(lib,path);
+    id = rpElementAsId(lib,path);
 
     if (!searchEle) {
@@ -42 +42 @@
         printf("searchEle type = :%s:\n", type);
 
-        comp = nodeComp(searchEle);
-        id   = nodeId(searchEle);
-        type = nodeType(searchEle);
-        
+        comp = rpNodeComp(searchEle);
+        id   = rpNodeId(searchEle);
+        type = rpNodeType(searchEle);
+
         printf("searchEle comp = :%s:\n", comp);
         printf("searchEle   id = :%s:\n", id);
@@ -63 +63 @@
     printf("TESTING GET String: path = %s\n", path);
 
-    searchVal = getString(lib,path);
+    searchVal = rpGetString(lib,path);
 
     if (!searchVal || *searchVal == '\0') {
@@ -84 +84 @@
     printf("TESTING GET Double: path = %s\n", path);
 
-    searchVal = getDouble(lib,path);
+    searchVal = rpGetDouble(lib,path);
 
     printf("searchVal = :%f:\n", searchVal);
@@ -102 +102 @@
     printf("TESTING CHILDREN: path = %s\n", path);
 
-    while ( (childEle = children(lib,path,childEle)) ) {
-        comp = nodeComp(childEle);
-        id   = nodeId(childEle);
-        type = nodeType(childEle);
+    while ( (childEle = rpChildren(lib,path,childEle)) ) {
+        comp = rpNodeComp(childEle);
+        id   = rpNodeId(childEle);
+        type = rpNodeType(childEle);
 
         printf("childEle comp = :%s:\n",comp);
@@ -128 +128 @@
     printf("TESTING CHILDREN: path = %s\n", path);
 
-    while ( (childEle = childrenByType(lib,path,childEle,searchType)) ) {
-        comp = nodeComp(childEle);
-        id   = nodeId(childEle);
-        type = nodeType(childEle);
+    while ( (childEle = rpChildrenByType(lib,path,childEle,searchType)) ) {
+        comp = rpNodeComp(childEle);
+        id   = rpNodeId(childEle);
+        type = rpNodeType(childEle);
 
         printf("childEle comp = :%s:\n",comp);
@@ -151 +151 @@
     printf("TESTING PUT String: path = %s\n", path);
 
-    putString(lib,path,value,append);
-    searchVal = getString(lib, path);
+    rpPutString(lib,path,value,append);
+    searchVal = rpGetString(lib, path);
 
     if (!searchVal || *searchVal == '\0') {
@@ -173 +173 @@
     printf("TESTING PUT String: path = %s\n", path);
 
-    putDouble(lib,path,value,append);
-    searchVal = getDouble(lib, path);
+    rpPutDouble(lib,path,value,append);
+    searchVal = rpGetDouble(lib, path);
     printf("searchVal = :%f:\n", searchVal);
     retVal = 0;
@@ -186 +186 @@
     RpLibrary* lib = NULL;
 
-    if (argc < 3)
+    if (argc < 2)
     {
-        printf("usage: RpLibrary_test infile.xml outfile.xml\n");
+        printf("usage: %s driver.xml\n", argv[0]);
         return -1;
     }
 
-    lib = library(argv[1]);
+    lib = rpLibrary(argv[1]);
 
     test_element(lib,"input.number(min)");
@@ -217 +217 @@
     test_childrenByType(lib,"input.number(test)","preset");
 
-    printf("XML = \n%s\n",xml(lib));
+    printf("XML = \n%s\n",rpXml(lib));
     
-    freeLibrary(lib);
+    rpFreeLibrary(lib);
 
     return 0;