Changeset 125 for trunk/src/fortran

Timestamp:

Nov 4, 2005 3:19:11 PM (18 years ago)

Author:

dkearney

Message:

1) removed "as" string from c++'s element() function because
the function does not have the capacity to return anything
other than RpLibrary? Instances
2) changed get() functions in library module to return strings.
this change was propagated to matlab, octave, c, fortran, c++
bindings.
3) fixed rpFreeLibrary inside of c interface, now function accepts
a pointer to a pointer to RpLibrary? (lib) and sets *lib equal to
null
4) added doxygen target to makefile. (make docs), to get graphics
you need the program named dot (debian: apt-get install graphviz)
otherwise you will get errors for the portion of the proceedure
where it is trying to create the graphics.

Location:

trunk/src/fortran

Files:

• RpLibraryFInterface.cc (modified) (2 diffs)
• RpLibraryFStubs.c (modified) (1 diff)

trunk/src/fortran/RpLibraryFInterface.cc

@@ -462 +462 @@
 
         if (lib) {
+            xmlText = lib->get(inPath);
+            if (!xmlText.empty()) {
+                fortranify(xmlText.c_str(),retText,retText_len);
+            }
+
+        }
+    }
+}
+
+/**********************************************************************/
+// FUNCTION: rp_lib_get_str()
+/// Get data located at 'path' and return it as a string value.
+/**
+ */
+void rp_lib_get_str( int* handle, /* integer handle of library */
+                   char* path,      /* null terminated path */
+                   char* retText,   /* return text buffer for fortran*/
+                   int path_len,
+                   int retText_len /* length of return text buffer */
+                 )
+{
+    std::string xmlText = "";
+
+    RpLibrary* lib = NULL;
+
+    std::string inPath = "";
+
+    inPath = null_terminate_str(path,path_len);
+
+    if ((handle) && (*handle != 0)) {
+        lib = getObject_Lib(*handle);
+
+        if (lib) {
             xmlText = lib->getString(inPath);
             if (!xmlText.empty()) {
@@ -470 +503 @@
     }
 }
+
 
 /**********************************************************************/

trunk/src/fortran/RpLibraryFStubs.c

@@ -238 +238 @@
 }
 
+void
+rp_lib_get_str_ (       int* handle,
+                        char* path,
+                        char* retText,
+                        int path_len,
+                        int retText_len ) {
+
+    return rp_lib_get_str(handle,path,retText,path_len,retText_len);
+}
+
+void
+rp_lib_get_str__ (      int* handle,
+                        char* path,
+                        char* retText,
+                        int path_len,
+                        int retText_len ) {
+
+    return rp_lib_get_str(handle,path,retText,path_len,retText_len);
+}
+
+void
+RP_LIB_GET_STR  (       int* handle,
+                        char* path,
+                        char* retText,
+                        int path_len,
+                        int retText_len ) {
+
+    return rp_lib_get_str(handle,path,retText,path_len,retText_len);
+}
+
 double
 rp_lib_get_double_ (    int* handle,