Changeset 73 for trunk/src/python

Timestamp:

Sep 28, 2005 12:09:43 AM (19 years ago)

Author:

dkearney

Message:

1. changes to RpUnits, modified RpUnits::define() function not to look for base units.
2. changed python RpUnits to return string when units!="off" and a number when units=="off"
3. modified make files, hopefully making them easier to read, removing vpaths,

cleaning up the make process, combining smaller libraries into one library,
librappture, and putting the core objects into one library - libRpObjects,
for testing.

4. copied rpResult function into rappture_interface.c to stop compiler from

complaining about undefined references ot the function. trying to use the
function probably won't work. but that can be fixed after the repository is
reorganized.

5. in example/app-fermi/python/fermi.py, changed exit() to sys.exit() to

stop python from complaining about no function called exit().

6. examples/app-fermi/fortran still does not run, but new rappture parser

should take care of these problems. (same with examples/fermi_fortran)

File:

• trunk/src/python/PyRpUnits.cc (modified) (3 diffs)

trunk/src/python/PyRpUnits.cc

@@ -428 +428 @@
     char* to = NULL;
     char* units = NULL;
+    char* tmpRetStr = NULL;
     std::string fromVal_S = "";
     std::string to_S = "";
@@ -434 +435 @@
     int result = 0;
     std::string retStr = "";
+    PyObject* retVal = NULL;
 
     static char *kwlist[] = {"fromVal", "to", "units", NULL};
@@ -462 +464 @@
     retStr = RpUnits::convert(fromVal_S,to_S,unitsVal,&result);
 
-    if (!retStr.empty()) {
-
-    }
-        
-    return PyString_FromString(retStr.c_str());
+    if ( (!retStr.empty()) && (result == 1) ) {
+        if (unitsVal) {
+            retVal = PyString_FromString(retStr.c_str());   
+        }
+        else {
+            // convert to an integer and return that if 
+            // the units were turned off
+            tmpRetStr = (char*) calloc(retStr.length(), sizeof(char));
+            if (tmpRetStr) {
+                strncpy(tmpRetStr,retStr.c_str(),retStr.length());
+                retVal = PyInt_FromString(tmpRetStr, NULL, 0);
+                free(tmpRetStr);
+                tmpRetStr = NULL;
+            }
+        }
+    }
+    else {
+        //keeping this around in case you want string returned instead of None
+        //if (fromVal) {
+        //    retVal = PyString_FromString(fromVal);   
+        //}
+        //else {
+        retVal = Py_None;
+        Py_INCREF(retVal);
+        //}
+    }
+    
+    return retVal;
 }