Open-ILS/src/c-apps/oils_cstore.c

   1 #include <ctype.h>
   2 #include "opensrf/osrf_application.h"
   3 #include "opensrf/osrf_settings.h"
   4 #include "opensrf/osrf_message.h"
   5 #include "opensrf/utils.h"
   6 #include "opensrf/osrf_json.h"
   7 #include "opensrf/log.h"
   8 #include "openils/oils_utils.h"
   9 #include <dbi/dbi.h>
  10
  11 #include <time.h>
  12 #include <stdlib.h>
  13 #include <string.h>
  14 #include <unistd.h>
  15
  16 #ifdef RSTORE
  17 #  define MODULENAME "open-ils.reporter-store"
  18 #else
  19 #  ifdef PCRUD
  20 #    define MODULENAME "open-ils.pcrud"
  21 #  else
  22 #    define MODULENAME "open-ils.cstore"
  23 #  endif
  24 #endif
  25
  26 #define SUBSELECT       4
  27 #define DISABLE_I18N    2
  28 #define SELECT_DISTINCT 1
  29 #define AND_OP_JOIN     0
  30 #define OR_OP_JOIN      1
  31
  32 struct ClassInfoStruct;
  33 typedef struct ClassInfoStruct ClassInfo;
  34
  35 #define ALIAS_STORE_SIZE 16
  36 #define CLASS_NAME_STORE_SIZE 16
  37
  38 struct ClassInfoStruct {
  39         char* alias;
  40         char* class_name;
  41         char* source_def;
  42         osrfHash* class_def;      // Points into IDL
  43         osrfHash* fields;         // Points into IDL
  44         osrfHash* links;          // Points into IDL
  45
  46         // The remaining members are private and internal.  Client code should not
  47         // access them directly.
  48
  49         ClassInfo* next;          // Supports linked list of joined classes
  50         int in_use;               // boolean
  51
  52         // We usually store the alias and class name in the following arrays, and
  53         // point the corresponding pointers at them.  When the string is too big
  54         // for the array (which will probably never happen in practice), we strdup it.
  55
  56         char alias_store[ ALIAS_STORE_SIZE + 1 ];
  57         char class_name_store[ CLASS_NAME_STORE_SIZE + 1 ];
  58 };
  59
  60 struct QueryFrameStruct;
  61 typedef struct QueryFrameStruct QueryFrame;
  62
  63 struct QueryFrameStruct {
  64         ClassInfo core;
  65         ClassInfo* join_list;  // linked list of classes joined to the core class
  66         QueryFrame* next;      // implements stack as linked list
  67         int in_use;            // boolean
  68 };
  69
  70 int osrfAppChildInit();
  71 int osrfAppInitialize();
  72 void osrfAppChildExit();
  73
  74 static int verifyObjectClass ( osrfMethodContext*, const jsonObject* );
  75
  76 int beginTransaction ( osrfMethodContext* );
  77 int commitTransaction ( osrfMethodContext* );
  78 int rollbackTransaction ( osrfMethodContext* );
  79
  80 int setSavepoint ( osrfMethodContext* );
  81 int releaseSavepoint ( osrfMethodContext* );
  82 int rollbackSavepoint ( osrfMethodContext* );
  83
  84 int doJSONSearch ( osrfMethodContext* );
  85
  86 int dispatchCRUDMethod ( osrfMethodContext* );
  87 static jsonObject* doCreate ( osrfMethodContext*, int* );
  88 static jsonObject* doRetrieve ( osrfMethodContext*, int* );
  89 static jsonObject* doUpdate ( osrfMethodContext*, int* );
  90 static jsonObject* doDelete ( osrfMethodContext*, int* );
  91 static jsonObject* doFieldmapperSearch ( osrfMethodContext* ctx, osrfHash* meta,
  92                 jsonObject* where_hash, jsonObject* query_hash, int* err );
  93 static jsonObject* oilsMakeFieldmapperFromResult( dbi_result, osrfHash* );
  94 static jsonObject* oilsMakeJSONFromResult( dbi_result );
  95
  96 static char* searchSimplePredicate ( const char* op, const char* class_alias,
  97                                 osrfHash* field, const jsonObject* node );
  98 static char* searchFunctionPredicate ( const char*, osrfHash*, const jsonObject*, const char* );
  99 static char* searchFieldTransform ( const char*, osrfHash*, const jsonObject*);
 100 static char* searchFieldTransformPredicate ( const ClassInfo*, osrfHash*, const jsonObject*, const char* );
 101 static char* searchBETWEENPredicate ( const char*, osrfHash*, const jsonObject* );
 102 static char* searchINPredicate ( const char*, osrfHash*,
 103                                                                  jsonObject*, const char*, osrfMethodContext* );
 104 static char* searchPredicate ( const ClassInfo*, osrfHash*, jsonObject*, osrfMethodContext* );
 105 static char* searchJOIN ( const jsonObject*, const ClassInfo* left_info );
 106 static char* searchWHERE ( const jsonObject*, const ClassInfo*, int, osrfMethodContext* );
 107 static char* buildSELECT ( jsonObject*, jsonObject*, osrfHash*, osrfMethodContext* );
 108
 109 char* SELECT ( osrfMethodContext*, jsonObject*, jsonObject*, jsonObject*, jsonObject*, jsonObject*, jsonObject*, jsonObject*, int );
 110
 111 void userDataFree( void* );
 112 static void sessionDataFree( char*, void* );
 113 static char* getSourceDefinition( osrfHash* );
 114 static int str_is_true( const char* str );
 115 static int obj_is_true( const jsonObject* obj );
 116 static const char* json_type( int code );
 117 static const char* get_primitive( osrfHash* field );
 118 static const char* get_datatype( osrfHash* field );
 119 static int is_identifier( const char* s);
 120 static int is_good_operator( const char* op );
 121 static void pop_query_frame( void );
 122 static void push_query_frame( void );
 123 static int add_query_core( const char* alias, const char* class_name );
 124 static ClassInfo* search_alias( const char* target );
 125 static ClassInfo* search_all_alias( const char* target );
 126 static ClassInfo* add_joined_class( const char* alias, const char* classname );
 127 static void clear_query_stack( void );
 128
 129 #ifdef PCRUD
 130 static jsonObject* verifyUserPCRUD( osrfMethodContext* );
 131 static int verifyObjectPCRUD( osrfMethodContext*, const jsonObject* );
 132 static char* org_tree_root( osrfMethodContext* ctx );
 133 static jsonObject* single_hash( const char* key, const char* value );
 134 #endif
 135
 136 static int child_initialized = 0;   /* boolean */
 137
 138 static dbi_conn writehandle; /* our MASTER db connection */
 139 static dbi_conn dbhandle; /* our CURRENT db connection */
 140 //static osrfHash * readHandles;
 141 static jsonObject* const jsonNULL = NULL; //
 142 static int max_flesh_depth = 100;
 143
 144 // The following points the top of a stack of QueryFrames.  It's a little
 145 // confusing because the top level of the query is at the bottom of the stack.
 146 static QueryFrame* curr_query = NULL;
 147
 148 /* called when this process is about to exit */
 149 void osrfAppChildExit() {
 150     osrfLogDebug(OSRF_LOG_MARK, "Child is exiting, disconnecting from database...");
 151
 152     int same = 0;
 153     if (writehandle == dbhandle) same = 1;
 154     if (writehandle) {
 155         dbi_conn_query(writehandle, "ROLLBACK;");
 156         dbi_conn_close(writehandle);
 157         writehandle = NULL;
 158     }
 159     if (dbhandle && !same)
 160         dbi_conn_close(dbhandle);
 161
 162     // XXX add cleanup of readHandles whenever that gets used
 163
 164     return;
 165 }
 166
 167 int osrfAppInitialize() {
 168
 169     osrfLogInfo(OSRF_LOG_MARK, "Initializing the CStore Server...");
 170     osrfLogInfo(OSRF_LOG_MARK, "Finding XML file...");
 171
 172     if (!oilsIDLInit( osrf_settings_host_value("/IDL") )) return 1; /* return non-zero to indicate error */
 173
 174     growing_buffer* method_name = buffer_init(64);
 175 #ifndef PCRUD
 176     // Generic search thingy
 177     buffer_add(method_name, MODULENAME);
 178         buffer_add(method_name, ".json_query");
 179         osrfAppRegisterMethod( MODULENAME, OSRF_BUFFER_C_STR(method_name),
 180                                                    "doJSONSearch", "", 1, OSRF_METHOD_STREAMING );
 181 #endif
 182
 183     // first we register all the transaction and savepoint methods
 184     buffer_reset(method_name);
 185         OSRF_BUFFER_ADD(method_name, MODULENAME);
 186         OSRF_BUFFER_ADD(method_name, ".transaction.begin");
 187         osrfAppRegisterMethod( MODULENAME, OSRF_BUFFER_C_STR(method_name),
 188                                                    "beginTransaction", "", 0, 0 );
 189
 190     buffer_reset(method_name);
 191         OSRF_BUFFER_ADD(method_name, MODULENAME);
 192         OSRF_BUFFER_ADD(method_name, ".transaction.commit");
 193         osrfAppRegisterMethod( MODULENAME, OSRF_BUFFER_C_STR(method_name),
 194                                                    "commitTransaction", "", 0, 0 );
 195
 196     buffer_reset(method_name);
 197         OSRF_BUFFER_ADD(method_name, MODULENAME);
 198         OSRF_BUFFER_ADD(method_name, ".transaction.rollback");
 199         osrfAppRegisterMethod( MODULENAME, OSRF_BUFFER_C_STR(method_name),
 200                                                    "rollbackTransaction", "", 0, 0 );
 201
 202     buffer_reset(method_name);
 203         OSRF_BUFFER_ADD(method_name, MODULENAME);
 204         OSRF_BUFFER_ADD(method_name, ".savepoint.set");
 205         osrfAppRegisterMethod( MODULENAME, OSRF_BUFFER_C_STR(method_name),
 206                                                    "setSavepoint", "", 1, 0 );
 207
 208     buffer_reset(method_name);
 209         OSRF_BUFFER_ADD(method_name, MODULENAME);
 210         OSRF_BUFFER_ADD(method_name, ".savepoint.release");
 211         osrfAppRegisterMethod( MODULENAME, OSRF_BUFFER_C_STR(method_name),
 212                                                    "releaseSavepoint", "", 1, 0 );
 213
 214     buffer_reset(method_name);
 215         OSRF_BUFFER_ADD(method_name, MODULENAME);
 216         OSRF_BUFFER_ADD(method_name, ".savepoint.rollback");
 217         osrfAppRegisterMethod( MODULENAME, OSRF_BUFFER_C_STR(method_name),
 218                                                    "rollbackSavepoint", "", 1, 0 );
 219
 220         static const char* global_method[] = {
 221                 "create",
 222                 "retrieve",
 223                 "update",
 224                 "delete",
 225                 "search",
 226                 "id_list"
 227         };
 228         const int global_method_count
 229                 = sizeof( global_method ) / sizeof ( global_method[0] );
 230
 231         unsigned long class_count = osrfHashGetCount( oilsIDL() );
 232         osrfLogDebug(OSRF_LOG_MARK, "%lu classes loaded", class_count );
 233         osrfLogDebug(OSRF_LOG_MARK,
 234                 "At most %lu methods will be generated",
 235                 (unsigned long) (class_count * global_method_count) );
 236
 237         osrfHashIterator* class_itr = osrfNewHashIterator( oilsIDL() );
 238         osrfHash* idlClass = NULL;
 239
 240         // For each class in IDL...
 241         while( (idlClass = osrfHashIteratorNext( class_itr ) ) ) {
 242
 243                 const char* classname = osrfHashIteratorKey( class_itr );
 244         osrfLogInfo(OSRF_LOG_MARK, "Generating class methods for %s", classname);
 245
 246         if (!osrfStringArrayContains( osrfHashGet(idlClass, "controller"), MODULENAME )) {
 247             osrfLogInfo(OSRF_LOG_MARK, "%s is not listed as a controller for %s, moving on", MODULENAME, classname);
 248             continue;
 249         }
 250
 251                 if ( str_is_true( osrfHashGet(idlClass, "virtual") ) ) {
 252                         osrfLogDebug(OSRF_LOG_MARK, "Class %s is virtual, skipping", classname );
 253                         continue;
 254                 }
 255
 256                 // Look up some other attributes of the current class
 257                 const char* idlClass_fieldmapper = osrfHashGet(idlClass, "fieldmapper");
 258                 if( !idlClass_fieldmapper ) {
 259                         osrfLogDebug( OSRF_LOG_MARK, "Skipping class \"%s\"; no fieldmapper in IDL", classname );
 260                         continue;
 261                 }
 262
 263 #ifdef PCRUD
 264                 osrfHash* idlClass_permacrud = osrfHashGet(idlClass, "permacrud");
 265                 if (!idlClass_permacrud) {
 266                         osrfLogDebug( OSRF_LOG_MARK, "Skipping class \"%s\"; no permacrud in IDL", classname );
 267                         continue;
 268                 }
 269 #endif
 270                 const char* readonly = osrfHashGet(idlClass, "readonly");
 271
 272         int i;
 273         for( i = 0; i < global_method_count; ++i ) {  // for each global method
 274             const char* method_type = global_method[ i ];
 275             osrfLogDebug(OSRF_LOG_MARK,
 276                 "Using files to build %s class methods for %s", method_type, classname);
 277
 278 #ifdef PCRUD
 279             const char* tmp_method = method_type;
 280             if ( *tmp_method == 'i' || *tmp_method == 's') {
 281                 tmp_method = "retrieve";
 282             }
 283             if (!osrfHashGet( idlClass_permacrud, tmp_method )) continue;
 284 #endif
 285
 286             if (    str_is_true( readonly ) &&
 287                     ( *method_type == 'c' || *method_type == 'u' || *method_type == 'd')
 288                ) continue;
 289
 290             buffer_reset( method_name );
 291 #ifdef PCRUD
 292             buffer_fadd(method_name, "%s.%s.%s", MODULENAME, method_type, classname);
 293 #else
 294             char* st_tmp = NULL;
 295             char* part = NULL;
 296             char* _fm = strdup( idlClass_fieldmapper );
 297             part = strtok_r(_fm, ":", &st_tmp);
 298
 299             buffer_fadd(method_name, "%s.direct.%s", MODULENAME, part);
 300
 301             while ((part = strtok_r(NULL, ":", &st_tmp))) {
 302                                 OSRF_BUFFER_ADD_CHAR(method_name, '.');
 303                                 OSRF_BUFFER_ADD(method_name, part);
 304             }
 305                         OSRF_BUFFER_ADD_CHAR(method_name, '.');
 306                         OSRF_BUFFER_ADD(method_name, method_type);
 307             free(_fm);
 308 #endif
 309
 310             char* method = buffer_data(method_name);
 311
 312             int flags = 0;
 313             if (*method_type == 'i' || *method_type == 's') {
 314                 flags = flags | OSRF_METHOD_STREAMING;
 315             }
 316
 317                         osrfHash* method_meta = osrfNewHash();
 318                         osrfHashSet( method_meta, idlClass, "class");
 319                         osrfHashSet( method_meta, method, "methodname" );
 320                         osrfHashSet( method_meta, strdup(method_type), "methodtype" );
 321
 322                         osrfAppRegisterExtendedMethod(
 323                     MODULENAME,
 324                     method,
 325                     "dispatchCRUDMethod",
 326                     "",
 327                     1,
 328                     flags,
 329                     (void*)method_meta
 330                     );
 331
 332             free(method);
 333         } // end for each global method
 334     } // end for each class in IDL
 335
 336         buffer_free( method_name );
 337         osrfHashIteratorFree( class_itr );
 338
 339     return 0;
 340 }
 341
 342 static char* getSourceDefinition( osrfHash* class ) {
 343
 344         char* tabledef = osrfHashGet(class, "tablename");
 345
 346         if (tabledef) {
 347                 tabledef = strdup(tabledef);
 348         } else {
 349                 tabledef = osrfHashGet(class, "source_definition");
 350                 if( tabledef ) {
 351                         growing_buffer* tablebuf = buffer_init(128);
 352                         buffer_fadd( tablebuf, "(%s)", tabledef );
 353                         tabledef = buffer_release(tablebuf);
 354                 } else {
 355                         const char* classname = osrfHashGet( class, "classname" );
 356                         if( !classname )
 357                                 classname = "???";
 358                         osrfLogError(
 359                                 OSRF_LOG_MARK,
 360                                 "%s ERROR No tablename or source_definition for class \"%s\"",
 361                                 MODULENAME,
 362                                 classname
 363                         );
 364                 }
 365         }
 366
 367         return tabledef;
 368 }
 369
 370 /**
 371  * Connects to the database
 372  */
 373 int osrfAppChildInit() {
 374
 375     osrfLogDebug(OSRF_LOG_MARK, "Attempting to initialize libdbi...");
 376     dbi_initialize(NULL);
 377     osrfLogDebug(OSRF_LOG_MARK, "... libdbi initialized.");
 378
 379     char* driver        = osrf_settings_host_value("/apps/%s/app_settings/driver", MODULENAME);
 380     char* user  = osrf_settings_host_value("/apps/%s/app_settings/database/user", MODULENAME);
 381     char* host  = osrf_settings_host_value("/apps/%s/app_settings/database/host", MODULENAME);
 382     char* port  = osrf_settings_host_value("/apps/%s/app_settings/database/port", MODULENAME);
 383     char* db    = osrf_settings_host_value("/apps/%s/app_settings/database/db", MODULENAME);
 384     char* pw    = osrf_settings_host_value("/apps/%s/app_settings/database/pw", MODULENAME);
 385     char* md    = osrf_settings_host_value("/apps/%s/app_settings/max_query_recursion", MODULENAME);
 386
 387     osrfLogDebug(OSRF_LOG_MARK, "Attempting to load the database driver [%s]...", driver);
 388     writehandle = dbi_conn_new(driver);
 389
 390     if(!writehandle) {
 391         osrfLogError(OSRF_LOG_MARK, "Error loading database driver [%s]", driver);
 392         return -1;
 393     }
 394     osrfLogDebug(OSRF_LOG_MARK, "Database driver [%s] seems OK", driver);
 395
 396     osrfLogInfo(OSRF_LOG_MARK, "%s connecting to database.  host=%s, "
 397             "port=%s, user=%s, pw=%s, db=%s", MODULENAME, host, port, user, pw, db );
 398
 399     if(host) dbi_conn_set_option(writehandle, "host", host );
 400     if(port) dbi_conn_set_option_numeric( writehandle, "port", atoi(port) );
 401     if(user) dbi_conn_set_option(writehandle, "username", user);
 402     if(pw) dbi_conn_set_option(writehandle, "password", pw );
 403     if(db) dbi_conn_set_option(writehandle, "dbname", db );
 404
 405     if(md) max_flesh_depth = atoi(md);
 406     if(max_flesh_depth < 0) max_flesh_depth = 1;
 407     if(max_flesh_depth > 1000) max_flesh_depth = 1000;
 408
 409     free(user);
 410     free(host);
 411     free(port);
 412     free(db);
 413     free(pw);
 414
 415     const char* err;
 416     if (dbi_conn_connect(writehandle) < 0) {
 417         sleep(1);
 418         if (dbi_conn_connect(writehandle) < 0) {
 419             dbi_conn_error(writehandle, &err);
 420             osrfLogError( OSRF_LOG_MARK, "Error connecting to database: %s", err);
 421             return -1;
 422         }
 423     }
 424
 425     osrfLogInfo(OSRF_LOG_MARK, "%s successfully connected to the database", MODULENAME);
 426
 427         osrfHashIterator* class_itr = osrfNewHashIterator( oilsIDL() );
 428         osrfHash* class = NULL;
 429
 430         while( (class = osrfHashIteratorNext( class_itr ) ) ) {
 431                 const char* classname = osrfHashIteratorKey( class_itr );
 432         osrfHash* fields = osrfHashGet( class, "fields" );
 433
 434                 if( str_is_true( osrfHashGet(class, "virtual") ) ) {
 435                         osrfLogDebug(OSRF_LOG_MARK, "Class %s is virtual, skipping", classname );
 436                         continue;
 437                 }
 438
 439         char* tabledef = getSourceDefinition(class);
 440                 if( !tabledef )
 441                         tabledef = strdup( "(null)" );
 442
 443         growing_buffer* sql_buf = buffer_init(32);
 444         buffer_fadd( sql_buf, "SELECT * FROM %s AS x WHERE 1=0;", tabledef );
 445
 446         free(tabledef);
 447
 448         char* sql = buffer_release(sql_buf);
 449         osrfLogDebug(OSRF_LOG_MARK, "%s Investigatory SQL = %s", MODULENAME, sql);
 450
 451         dbi_result result = dbi_conn_query(writehandle, sql);
 452         free(sql);
 453
 454         if (result) {
 455
 456             int columnIndex = 1;
 457             const char* columnName;
 458             osrfHash* _f;
 459             while( (columnName = dbi_result_get_field_name(result, columnIndex)) ) {
 460
 461                 osrfLogInternal(OSRF_LOG_MARK, "Looking for column named [%s]...", (char*)columnName);
 462
 463                 /* fetch the fieldmapper index */
 464                 if( (_f = osrfHashGet(fields, (char*)columnName)) ) {
 465
 466                                         osrfLogDebug(OSRF_LOG_MARK, "Found [%s] in IDL hash...", (char*)columnName);
 467
 468                                         /* determine the field type and storage attributes */
 469
 470                                         switch( dbi_result_get_field_type_idx(result, columnIndex) ) {
 471
 472                                                 case DBI_TYPE_INTEGER : {
 473
 474                                                         if ( !osrfHashGet(_f, "primitive") )
 475                                                                 osrfHashSet(_f,"number", "primitive");
 476
 477                                                         int attr = dbi_result_get_field_attribs_idx(result, columnIndex);
 478                                                         if( attr & DBI_INTEGER_SIZE8 )
 479                                                                 osrfHashSet(_f,"INT8", "datatype");
 480                                                         else
 481                                                                 osrfHashSet(_f,"INT", "datatype");
 482                                                         break;
 483                                                 }
 484                         case DBI_TYPE_DECIMAL :
 485                             if ( !osrfHashGet(_f, "primitive") )
 486                                 osrfHashSet(_f,"number", "primitive");
 487
 488                             osrfHashSet(_f,"NUMERIC", "datatype");
 489                             break;
 490
 491                         case DBI_TYPE_STRING :
 492                             if ( !osrfHashGet(_f, "primitive") )
 493                                 osrfHashSet(_f,"string", "primitive");
 494                             osrfHashSet(_f,"TEXT", "datatype");
 495                             break;
 496
 497                         case DBI_TYPE_DATETIME :
 498                             if ( !osrfHashGet(_f, "primitive") )
 499                                 osrfHashSet(_f,"string", "primitive");
 500
 501                             osrfHashSet(_f,"TIMESTAMP", "datatype");
 502                             break;
 503
 504                         case DBI_TYPE_BINARY :
 505                             if ( !osrfHashGet(_f, "primitive") )
 506                                 osrfHashSet(_f,"string", "primitive");
 507
 508                             osrfHashSet(_f,"BYTEA", "datatype");
 509                     }
 510
 511                     osrfLogDebug(
 512                             OSRF_LOG_MARK,
 513                             "Setting [%s] to primitive [%s] and datatype [%s]...",
 514                             (char*)columnName,
 515                             osrfHashGet(_f, "primitive"),
 516                             osrfHashGet(_f, "datatype")
 517                             );
 518                 }
 519                                 ++columnIndex;
 520                         } // end while loop for traversing result
 521                         dbi_result_free(result);
 522                 } else {
 523                         osrfLogDebug(OSRF_LOG_MARK, "No data found for class [%s]...", (char*)classname);
 524                 }
 525         } // end for each class in IDL
 526
 527         osrfHashIteratorFree( class_itr );
 528         child_initialized = 1;
 529     return 0;
 530 }
 531
 532 /*
 533   This function is a sleazy hack intended *only* for testing and
 534   debugging.  Any real server process should initialize the
 535   database connection by calling osrfAppChildInit().
 536 */
 537 void set_cstore_dbi_conn( dbi_conn conn ) {
 538         dbhandle = writehandle = conn;
 539 }
 540
 541 void userDataFree( void* blob ) {
 542     osrfHashFree( (osrfHash*)blob );
 543     return;
 544 }
 545
 546 static void sessionDataFree( char* key, void* item ) {
 547     if (!(strcmp(key,"xact_id"))) {
 548         if (writehandle)
 549             dbi_conn_query(writehandle, "ROLLBACK;");
 550         free(item);
 551     }
 552
 553     return;
 554 }
 555
 556 int beginTransaction ( osrfMethodContext* ctx ) {
 557         if(osrfMethodVerifyContext( ctx )) {
 558                 osrfLogError( OSRF_LOG_MARK,  "Invalid method context" );
 559                 return -1;
 560         }
 561
 562 #ifdef PCRUD
 563     jsonObject* user = verifyUserPCRUD( ctx );
 564     if (!user) return -1;
 565     jsonObjectFree(user);
 566 #endif
 567
 568     dbi_result result = dbi_conn_query(writehandle, "START TRANSACTION;");
 569     if (!result) {
 570         osrfLogError(OSRF_LOG_MARK, "%s: Error starting transaction", MODULENAME );
 571         osrfAppSessionStatus( ctx->session, OSRF_STATUS_INTERNALSERVERERROR, "osrfMethodException", ctx->request, "Error starting transaction" );
 572         return -1;
 573     } else {
 574         jsonObject* ret = jsonNewObject(ctx->session->session_id);
 575         osrfAppRespondComplete( ctx, ret );
 576         jsonObjectFree(ret);
 577
 578         if (!ctx->session->userData) {
 579             ctx->session->userData = osrfNewHash();
 580             osrfHashSetCallback((osrfHash*)ctx->session->userData, &sessionDataFree);
 581         }
 582
 583         osrfHashSet( (osrfHash*)ctx->session->userData, strdup( ctx->session->session_id ), "xact_id" );
 584         ctx->session->userDataFree = &userDataFree;
 585
 586     }
 587     return 0;
 588 }
 589
 590 int setSavepoint ( osrfMethodContext* ctx ) {
 591         if(osrfMethodVerifyContext( ctx )) {
 592                 osrfLogError( OSRF_LOG_MARK,  "Invalid method context" );
 593                 return -1;
 594         }
 595
 596     int spNamePos = 0;
 597 #ifdef PCRUD
 598     spNamePos = 1;
 599     jsonObject* user = verifyUserPCRUD( ctx );
 600     if (!user) return -1;
 601     jsonObjectFree(user);
 602 #endif
 603
 604     if (!osrfHashGet( (osrfHash*)ctx->session->userData, "xact_id" )) {
 605         osrfAppSessionStatus(
 606                 ctx->session,
 607                 OSRF_STATUS_INTERNALSERVERERROR,
 608                 "osrfMethodException",
 609                 ctx->request,
 610                 "No active transaction -- required for savepoints"
 611                 );
 612         return -1;
 613     }
 614
 615         const char* spName = jsonObjectGetString(jsonObjectGetIndex(ctx->params, spNamePos));
 616
 617         dbi_result result = dbi_conn_queryf(writehandle, "SAVEPOINT \"%s\";", spName);
 618         if (!result) {
 619                 osrfLogError(
 620                         OSRF_LOG_MARK,
 621                         "%s: Error creating savepoint %s in transaction %s",
 622                         MODULENAME,
 623                         spName,
 624                         osrfHashGet( (osrfHash*)ctx->session->userData, "xact_id" )
 625                 );
 626                 osrfAppSessionStatus( ctx->session, OSRF_STATUS_INTERNALSERVERERROR,
 627                                 "osrfMethodException", ctx->request, "Error creating savepoint" );
 628                 return -1;
 629         } else {
 630                 jsonObject* ret = jsonNewObject(spName);
 631                 osrfAppRespondComplete( ctx, ret );
 632                 jsonObjectFree(ret);
 633         }
 634         return 0;
 635 }
 636
 637 int releaseSavepoint ( osrfMethodContext* ctx ) {
 638         if(osrfMethodVerifyContext( ctx )) {
 639                 osrfLogError( OSRF_LOG_MARK,  "Invalid method context" );
 640                 return -1;
 641         }
 642
 643         int spNamePos = 0;
 644 #ifdef PCRUD
 645     spNamePos = 1;
 646     jsonObject* user = verifyUserPCRUD( ctx );
 647     if (!user) return -1;
 648     jsonObjectFree(user);
 649 #endif
 650
 651     if (!osrfHashGet( (osrfHash*)ctx->session->userData, "xact_id" )) {
 652         osrfAppSessionStatus(
 653                 ctx->session,
 654                 OSRF_STATUS_INTERNALSERVERERROR,
 655                 "osrfMethodException",
 656                 ctx->request,
 657                 "No active transaction -- required for savepoints"
 658                 );
 659         return -1;
 660     }
 661
 662         const char* spName = jsonObjectGetString( jsonObjectGetIndex(ctx->params, spNamePos) );
 663
 664     dbi_result result = dbi_conn_queryf(writehandle, "RELEASE SAVEPOINT \"%s\";", spName);
 665     if (!result) {
 666         osrfLogError(
 667                 OSRF_LOG_MARK,
 668                 "%s: Error releasing savepoint %s in transaction %s",
 669                 MODULENAME,
 670                 spName,
 671                 osrfHashGet( (osrfHash*)ctx->session->userData, "xact_id" )
 672                 );
 673                 osrfAppSessionStatus( ctx->session, OSRF_STATUS_INTERNALSERVERERROR,
 674                                 "osrfMethodException", ctx->request, "Error releasing savepoint" );
 675         return -1;
 676     } else {
 677         jsonObject* ret = jsonNewObject(spName);
 678         osrfAppRespondComplete( ctx, ret );
 679         jsonObjectFree(ret);
 680     }
 681     return 0;
 682 }
 683
 684 int rollbackSavepoint ( osrfMethodContext* ctx ) {
 685         if(osrfMethodVerifyContext( ctx )) {
 686                 osrfLogError( OSRF_LOG_MARK,  "Invalid method context" );
 687                 return -1;
 688         }
 689
 690         int spNamePos = 0;
 691 #ifdef PCRUD
 692     spNamePos = 1;
 693     jsonObject* user = verifyUserPCRUD( ctx );
 694     if (!user) return -1;
 695     jsonObjectFree(user);
 696 #endif
 697
 698     if (!osrfHashGet( (osrfHash*)ctx->session->userData, "xact_id" )) {
 699         osrfAppSessionStatus(
 700                 ctx->session,
 701                 OSRF_STATUS_INTERNALSERVERERROR,
 702                 "osrfMethodException",
 703                 ctx->request,
 704                 "No active transaction -- required for savepoints"
 705                 );
 706         return -1;
 707     }
 708
 709         const char* spName = jsonObjectGetString( jsonObjectGetIndex(ctx->params, spNamePos) );
 710
 711     dbi_result result = dbi_conn_queryf(writehandle, "ROLLBACK TO SAVEPOINT \"%s\";", spName);
 712     if (!result) {
 713         osrfLogError(
 714                 OSRF_LOG_MARK,
 715                 "%s: Error rolling back savepoint %s in transaction %s",
 716                 MODULENAME,
 717                 spName,
 718                 osrfHashGet( (osrfHash*)ctx->session->userData, "xact_id" )
 719                 );
 720                 osrfAppSessionStatus( ctx->session, OSRF_STATUS_INTERNALSERVERERROR,
 721                                 "osrfMethodException", ctx->request, "Error rolling back savepoint" );
 722         return -1;
 723     } else {
 724         jsonObject* ret = jsonNewObject(spName);
 725         osrfAppRespondComplete( ctx, ret );
 726         jsonObjectFree(ret);
 727     }
 728     return 0;
 729 }
 730
 731 int commitTransaction ( osrfMethodContext* ctx ) {
 732         if(osrfMethodVerifyContext( ctx )) {
 733                 osrfLogError( OSRF_LOG_MARK,  "Invalid method context" );
 734                 return -1;
 735         }
 736
 737 #ifdef PCRUD
 738     jsonObject* user = verifyUserPCRUD( ctx );
 739     if (!user) return -1;
 740     jsonObjectFree(user);
 741 #endif
 742
 743     if (!osrfHashGet( (osrfHash*)ctx->session->userData, "xact_id" )) {
 744         osrfAppSessionStatus( ctx->session, OSRF_STATUS_INTERNALSERVERERROR, "osrfMethodException", ctx->request, "No active transaction to commit" );
 745         return -1;
 746     }
 747
 748     dbi_result result = dbi_conn_query(writehandle, "COMMIT;");
 749     if (!result) {
 750         osrfLogError(OSRF_LOG_MARK, "%s: Error committing transaction", MODULENAME );
 751         osrfAppSessionStatus( ctx->session, OSRF_STATUS_INTERNALSERVERERROR, "osrfMethodException", ctx->request, "Error committing transaction" );
 752         return -1;
 753     } else {
 754         osrfHashRemove(ctx->session->userData, "xact_id");
 755         jsonObject* ret = jsonNewObject(ctx->session->session_id);
 756         osrfAppRespondComplete( ctx, ret );
 757         jsonObjectFree(ret);
 758     }
 759     return 0;
 760 }
 761
 762 int rollbackTransaction ( osrfMethodContext* ctx ) {
 763         if(osrfMethodVerifyContext( ctx )) {
 764                 osrfLogError( OSRF_LOG_MARK,  "Invalid method context" );
 765                 return -1;
 766         }
 767
 768 #ifdef PCRUD
 769     jsonObject* user = verifyUserPCRUD( ctx );
 770     if (!user) return -1;
 771     jsonObjectFree(user);
 772 #endif
 773
 774     if (!osrfHashGet( (osrfHash*)ctx->session->userData, "xact_id" )) {
 775         osrfAppSessionStatus( ctx->session, OSRF_STATUS_INTERNALSERVERERROR, "osrfMethodException", ctx->request, "No active transaction to roll back" );
 776         return -1;
 777     }
 778
 779     dbi_result result = dbi_conn_query(writehandle, "ROLLBACK;");
 780     if (!result) {
 781         osrfLogError(OSRF_LOG_MARK, "%s: Error rolling back transaction", MODULENAME );
 782         osrfAppSessionStatus( ctx->session, OSRF_STATUS_INTERNALSERVERERROR, "osrfMethodException", ctx->request, "Error rolling back transaction" );
 783         return -1;
 784     } else {
 785         osrfHashRemove(ctx->session->userData, "xact_id");
 786         jsonObject* ret = jsonNewObject(ctx->session->session_id);
 787         osrfAppRespondComplete( ctx, ret );
 788         jsonObjectFree(ret);
 789     }
 790     return 0;
 791 }
 792
 793 int dispatchCRUDMethod ( osrfMethodContext* ctx ) {
 794         if(osrfMethodVerifyContext( ctx )) {
 795                 osrfLogError( OSRF_LOG_MARK,  "Invalid method context" );
 796                 return -1;
 797         }
 798
 799         osrfHash* meta = (osrfHash*) ctx->method->userData;
 800     osrfHash* class_obj = osrfHashGet( meta, "class" );
 801
 802     int err = 0;
 803
 804     const char* methodtype = osrfHashGet(meta, "methodtype");
 805     jsonObject * obj = NULL;
 806
 807     if (!strcmp(methodtype, "create")) {
 808         obj = doCreate(ctx, &err);
 809         osrfAppRespondComplete( ctx, obj );
 810     }
 811     else if (!strcmp(methodtype, "retrieve")) {
 812         obj = doRetrieve(ctx, &err);
 813         osrfAppRespondComplete( ctx, obj );
 814     }
 815     else if (!strcmp(methodtype, "update")) {
 816         obj = doUpdate(ctx, &err);
 817         osrfAppRespondComplete( ctx, obj );
 818     }
 819     else if (!strcmp(methodtype, "delete")) {
 820         obj = doDelete(ctx, &err);
 821         osrfAppRespondComplete( ctx, obj );
 822     }
 823     else if (!strcmp(methodtype, "search")) {
 824
 825                 jsonObject* where_clause;
 826                 jsonObject* rest_of_query;
 827
 828 #ifdef PCRUD
 829                 where_clause  = jsonObjectGetIndex( ctx->params, 1 );
 830                 rest_of_query = jsonObjectGetIndex( ctx->params, 2 );
 831 #else
 832                 where_clause  = jsonObjectGetIndex( ctx->params, 0 );
 833                 rest_of_query = jsonObjectGetIndex( ctx->params, 1 );
 834 #endif
 835
 836                 obj = doFieldmapperSearch( ctx, class_obj, where_clause, rest_of_query, &err );
 837
 838                 if(err) return err;
 839
 840                 jsonObject* cur = 0;
 841                 unsigned long res_idx = 0;
 842                 while((cur = jsonObjectGetIndex( obj, res_idx++ ) )) {
 843 #ifdef PCRUD
 844                         if(!verifyObjectPCRUD(ctx, cur)) continue;
 845 #endif
 846                         osrfAppRespond( ctx, cur );
 847                 }
 848                 osrfAppRespondComplete( ctx, NULL );
 849
 850         } else if (!strcmp(methodtype, "id_list")) {
 851
 852                 jsonObject* where_clause;
 853                 jsonObject* rest_of_query;
 854
 855                 // We use the where clause without change.  But we need
 856                 // to massage the rest of the query, so we work with a copy
 857                 // of it instead of modifying the original.
 858 #ifdef PCRUD
 859                 where_clause  = jsonObjectGetIndex( ctx->params, 1 );
 860                 rest_of_query = jsonObjectClone( jsonObjectGetIndex( ctx->params, 2 ) );
 861 #else
 862                 where_clause  = jsonObjectGetIndex( ctx->params, 0 );
 863                 rest_of_query = jsonObjectClone( jsonObjectGetIndex( ctx->params, 1 ) );
 864 #endif
 865
 866                 if ( rest_of_query ) {
 867                         jsonObjectRemoveKey( rest_of_query, "select" );
 868                         jsonObjectRemoveKey( rest_of_query, "no_i18n" );
 869                         jsonObjectRemoveKey( rest_of_query, "flesh" );
 870                         jsonObjectRemoveKey( rest_of_query, "flesh_columns" );
 871                 } else {
 872                         rest_of_query = jsonNewObjectType( JSON_HASH );
 873                 }
 874
 875                 jsonObjectSetKey( rest_of_query, "no_i18n", jsonNewBoolObject( 1 ) );
 876
 877                 // Build a SELECT list containing just the primary key,
 878                 // i.e. like { "classname":["keyname"] }
 879                 jsonObject* col_list_obj = jsonNewObjectType( JSON_ARRAY );
 880                 jsonObjectPush( col_list_obj,     // Load array with name of primary key
 881                         jsonNewObject( osrfHashGet( class_obj, "primarykey" ) ) );
 882                 jsonObject* select_clause = jsonNewObjectType( JSON_HASH );
 883                 jsonObjectSetKey( select_clause, osrfHashGet( class_obj, "classname" ), col_list_obj );
 884
 885                 jsonObjectSetKey( rest_of_query, "select", select_clause );
 886
 887                 obj = doFieldmapperSearch( ctx, class_obj, where_clause, rest_of_query, &err );
 888
 889                 jsonObjectFree( rest_of_query );
 890                 if(err) return err;
 891
 892                 jsonObject* cur;
 893                 unsigned long res_idx = 0;
 894                 while((cur = jsonObjectGetIndex( obj, res_idx++ ) )) {
 895 #ifdef PCRUD
 896                         if(!verifyObjectPCRUD(ctx, cur)) continue;
 897 #endif
 898                         osrfAppRespond(
 899                                 ctx,
 900                                 oilsFMGetObject( cur, osrfHashGet( class_obj, "primarykey" ) )
 901                                 );
 902                 }
 903                 osrfAppRespondComplete( ctx, NULL );
 904
 905     } else {
 906         osrfAppRespondComplete( ctx, obj );
 907     }
 908
 909     jsonObjectFree(obj);
 910
 911     return err;
 912 }
 913
 914 static int verifyObjectClass ( osrfMethodContext* ctx, const jsonObject* param ) {
 915
 916     int ret = 1;
 917     osrfHash* meta = (osrfHash*) ctx->method->userData;
 918     osrfHash* class = osrfHashGet( meta, "class" );
 919
 920     if (!param->classname || (strcmp( osrfHashGet(class, "classname"), param->classname ))) {
 921
 922                 const char* temp_classname = param->classname;
 923                 if( ! temp_classname )
 924                         temp_classname = "(null)";
 925
 926         growing_buffer* msg = buffer_init(128);
 927         buffer_fadd(
 928                 msg,
 929                 "%s: %s method for type %s was passed a %s",
 930                 MODULENAME,
 931                 osrfHashGet(meta, "methodtype"),
 932                 osrfHashGet(class, "classname"),
 933                 temp_classname
 934                 );
 935
 936         char* m = buffer_release(msg);
 937         osrfAppSessionStatus( ctx->session, OSRF_STATUS_BADREQUEST, "osrfMethodException", ctx->request, m );
 938
 939         free(m);
 940
 941         return 0;
 942     }
 943
 944 #ifdef PCRUD
 945     ret = verifyObjectPCRUD( ctx, param );
 946 #endif
 947
 948     return ret;
 949 }
 950
 951 #ifdef PCRUD
 952
 953 static jsonObject* verifyUserPCRUD( osrfMethodContext* ctx ) {
 954         const char* auth = jsonObjectGetString( jsonObjectGetIndex( ctx->params, 0 ) );
 955     jsonObject* auth_object = jsonNewObject(auth);
 956     jsonObject* user = oilsUtilsQuickReq("open-ils.auth","open-ils.auth.session.retrieve", auth_object);
 957     jsonObjectFree(auth_object);
 958
 959     if (!user->classname || strcmp(user->classname, "au")) {
 960
 961         growing_buffer* msg = buffer_init(128);
 962         buffer_fadd(
 963             msg,
 964             "%s: permacrud received a bad auth token: %s",
 965             MODULENAME,
 966             auth
 967         );
 968
 969         char* m = buffer_release(msg);
 970         osrfAppSessionStatus( ctx->session, OSRF_STATUS_UNAUTHORIZED, "osrfMethodException", ctx->request, m );
 971
 972         free(m);
 973         jsonObjectFree(user);
 974         user = jsonNULL;
 975     }
 976
 977     return user;
 978
 979 }
 980
 981 static int verifyObjectPCRUD (  osrfMethodContext* ctx, const jsonObject* obj ) {
 982
 983         dbhandle = writehandle;
 984
 985         osrfHash* method_metadata = (osrfHash*) ctx->method->userData;
 986         osrfHash* class = osrfHashGet( method_metadata, "class" );
 987         const char* method_type = osrfHashGet( method_metadata, "methodtype" );
 988         int fetch = 0;
 989
 990         if ( ( *method_type == 's' || *method_type == 'i' ) ) {
 991                 method_type = "retrieve"; // search and id_list are equivalant to retrieve for this
 992         } else if ( *method_type == 'u' || *method_type == 'd' ) {
 993                 fetch = 1; // MUST go to the db for the object for update and delete
 994         }
 995
 996         osrfHash* pcrud = osrfHashGet( osrfHashGet(class, "permacrud"), method_type );
 997
 998     if (!pcrud) {
 999         // No permacrud for this method type on this class
1000
1001         growing_buffer* msg = buffer_init(128);
1002         buffer_fadd(
1003             msg,
1004             "%s: %s on class %s has no permacrud IDL entry",
1005             MODULENAME,
1006             osrfHashGet(method_metadata, "methodtype"),
1007             osrfHashGet(class, "classname")
1008         );
1009
1010         char* m = buffer_release(msg);
1011         osrfAppSessionStatus( ctx->session, OSRF_STATUS_FORBIDDEN, "osrfMethodException", ctx->request, m );
1012
1013         free(m);
1014
1015         return 0;
1016     }
1017
1018     jsonObject* user = verifyUserPCRUD( ctx );
1019     if (!user) return 0;
1020
1021     int userid = atoi( oilsFMGetString( user, "id" ) );
1022     jsonObjectFree(user);
1023
1024     osrfStringArray* permission = osrfHashGet(pcrud, "permission");
1025     osrfStringArray* local_context = osrfHashGet(pcrud, "local_context");
1026     osrfHash* foreign_context = osrfHashGet(pcrud, "foreign_context");
1027
1028     osrfStringArray* context_org_array = osrfNewStringArray(1);
1029
1030     int err = 0;
1031     char* pkey_value = NULL;
1032         if ( str_is_true( osrfHashGet(pcrud, "global_required") ) ) {
1033                 osrfLogDebug( OSRF_LOG_MARK, "global-level permissions required, fetching top of the org tree" );
1034
1035                 // check for perm at top of org tree
1036                 char* org_tree_root_id = org_tree_root( ctx );
1037                 if( org_tree_root_id ) {
1038                         osrfStringArrayAdd( context_org_array, org_tree_root_id );
1039                         osrfLogDebug( OSRF_LOG_MARK, "top of the org tree is %s", org_tree_root_id );
1040                 } else  {
1041                         osrfStringArrayFree( context_org_array );
1042                         return 0;
1043                 }
1044
1045         } else {
1046             osrfLogDebug( OSRF_LOG_MARK, "global-level permissions not required, fetching context org ids" );
1047             const char* pkey = osrfHashGet(class, "primarykey");
1048         jsonObject *param = NULL;
1049
1050         if (obj->classname) {
1051             pkey_value = oilsFMGetString( obj, pkey );
1052             if (!fetch) param = jsonObjectClone(obj);
1053                 osrfLogDebug( OSRF_LOG_MARK, "Object supplied, using primary key value of %s", pkey_value );
1054         } else {
1055             pkey_value = jsonObjectToSimpleString( obj );
1056             fetch = 1;
1057                 osrfLogDebug( OSRF_LOG_MARK, "Object not supplied, using primary key value of %s and retrieving from the database", pkey_value );
1058         }
1059
1060                 if (fetch) {
1061                         jsonObject* _tmp_params = single_hash( pkey, pkey_value );
1062                         jsonObject* _list = doFieldmapperSearch( ctx, class, _tmp_params, NULL, &err );
1063                         jsonObjectFree(_tmp_params);
1064
1065                         param = jsonObjectExtractIndex(_list, 0);
1066                         jsonObjectFree(_list);
1067                 }
1068
1069         if (!param) {
1070             osrfLogDebug( OSRF_LOG_MARK, "Object not found in the database with primary key %s of %s", pkey, pkey_value );
1071
1072             growing_buffer* msg = buffer_init(128);
1073             buffer_fadd(
1074                 msg,
1075                 "%s: no object found with primary key %s of %s",
1076                 MODULENAME,
1077                 pkey,
1078                 pkey_value
1079             );
1080
1081             char* m = buffer_release(msg);
1082             osrfAppSessionStatus(
1083                 ctx->session,
1084                 OSRF_STATUS_INTERNALSERVERERROR,
1085                 "osrfMethodException",
1086                 ctx->request,
1087                 m
1088             );
1089
1090             free(m);
1091             if (pkey_value) free(pkey_value);
1092
1093             return 0;
1094         }
1095
1096         if (local_context->size > 0) {
1097                 osrfLogDebug( OSRF_LOG_MARK, "%d class-local context field(s) specified", local_context->size);
1098             int i = 0;
1099             char* lcontext = NULL;
1100             while ( (lcontext = osrfStringArrayGetString(local_context, i++)) ) {
1101                 osrfStringArrayAdd( context_org_array, oilsFMGetString( param, lcontext ) );
1102                     osrfLogDebug(
1103                     OSRF_LOG_MARK,
1104                     "adding class-local field %s (value: %s) to the context org list",
1105                     lcontext,
1106                     osrfStringArrayGetString(context_org_array, context_org_array->size - 1)
1107                 );
1108             }
1109         }
1110
1111
1112                 if (foreign_context) {
1113                         unsigned long class_count = osrfHashGetCount( foreign_context );
1114                         osrfLogDebug( OSRF_LOG_MARK, "%d foreign context classes(s) specified", class_count);
1115
1116                         if (class_count > 0) {
1117
1118                                 osrfHash* fcontext = NULL;
1119                                 osrfHashIterator* class_itr = osrfNewHashIterator( foreign_context );
1120                                 while( (fcontext = osrfHashIteratorNext( class_itr ) ) ) {
1121                                         const char* class_name = osrfHashIteratorKey( class_itr );
1122                                         osrfHash* fcontext = osrfHashGet(foreign_context, class_name);
1123
1124                         osrfLogDebug(
1125                         OSRF_LOG_MARK,
1126                         "%d foreign context fields(s) specified for class %s",
1127                         ((osrfStringArray*)osrfHashGet(fcontext,"context"))->size,
1128                         class_name
1129                     );
1130
1131                     char* foreign_pkey = osrfHashGet(fcontext, "field");
1132                     char* foreign_pkey_value = oilsFMGetString(param, osrfHashGet(fcontext, "fkey"));
1133
1134                                         jsonObject* _tmp_params = single_hash( foreign_pkey, foreign_pkey_value );
1135
1136                                         jsonObject* _list = doFieldmapperSearch(
1137                                                 ctx, osrfHashGet( oilsIDL(), class_name ), _tmp_params, NULL, &err );
1138
1139                     jsonObject* _fparam = jsonObjectClone(jsonObjectGetIndex(_list, 0));
1140                     jsonObjectFree(_tmp_params);
1141                     jsonObjectFree(_list);
1142
1143                     osrfStringArray* jump_list = osrfHashGet(fcontext, "jump");
1144
1145                     if (_fparam && jump_list) {
1146                         char* flink = NULL;
1147                         int k = 0;
1148                         while ( (flink = osrfStringArrayGetString(jump_list, k++)) && _fparam ) {
1149                             free(foreign_pkey_value);
1150
1151                             osrfHash* foreign_link_hash = oilsIDLFindPath( "/%s/links/%s", _fparam->classname, flink );
1152
1153                                                         foreign_pkey_value = oilsFMGetString(_fparam, flink);
1154                                                         foreign_pkey = osrfHashGet( foreign_link_hash, "key" );
1155
1156                                                         _tmp_params = single_hash( foreign_pkey, foreign_pkey_value );
1157
1158                                                         _list = doFieldmapperSearch(
1159                                                                 ctx,
1160                                                                 osrfHashGet( oilsIDL(), osrfHashGet( foreign_link_hash, "class" ) ),
1161                                                                 _tmp_params,
1162                                                                 NULL,
1163                                                                 &err
1164                                                         );
1165
1166                             _fparam = jsonObjectClone(jsonObjectGetIndex(_list, 0));
1167                             jsonObjectFree(_tmp_params);
1168                             jsonObjectFree(_list);
1169                         }
1170                     }
1171
1172
1173                     if (!_fparam) {
1174
1175                         growing_buffer* msg = buffer_init(128);
1176                         buffer_fadd(
1177                             msg,
1178                             "%s: no object found with primary key %s of %s",
1179                             MODULENAME,
1180                             foreign_pkey,
1181                             foreign_pkey_value
1182                         );
1183
1184                         char* m = buffer_release(msg);
1185                         osrfAppSessionStatus(
1186                             ctx->session,
1187                             OSRF_STATUS_INTERNALSERVERERROR,
1188                             "osrfMethodException",
1189                             ctx->request,
1190                             m
1191                         );
1192
1193                         free(m);
1194                         osrfHashIteratorFree(class_itr);
1195                         free(foreign_pkey_value);
1196                         jsonObjectFree(param);
1197
1198                         return 0;
1199                     }
1200
1201                     free(foreign_pkey_value);
1202
1203                     int j = 0;
1204                     char* foreign_field = NULL;
1205                     while ( (foreign_field = osrfStringArrayGetString(osrfHashGet(fcontext,"context"), j++)) ) {
1206                         osrfStringArrayAdd( context_org_array, oilsFMGetString( _fparam, foreign_field ) );
1207                             osrfLogDebug(
1208                             OSRF_LOG_MARK,
1209                             "adding foreign class %s field %s (value: %s) to the context org list",
1210                             class_name,
1211                             foreign_field,
1212                             osrfStringArrayGetString(context_org_array, context_org_array->size - 1)
1213                         );
1214                                         }
1215
1216                                         jsonObjectFree(_fparam);
1217                                 }
1218
1219                                 osrfHashIteratorFree( class_itr );
1220                         }
1221                 }
1222
1223                 jsonObjectFree(param);
1224         }
1225
1226     char* context_org = NULL;
1227     char* perm = NULL;
1228     int OK = 0;
1229
1230     if (permission->size == 0) {
1231             osrfLogDebug( OSRF_LOG_MARK, "No permission specified for this action, passing through" );
1232         OK = 1;
1233     }
1234
1235     int i = 0;
1236     while ( (perm = osrfStringArrayGetString(permission, i++)) ) {
1237         int j = 0;
1238         while ( (context_org = osrfStringArrayGetString(context_org_array, j++)) ) {
1239             dbi_result result;
1240
1241             if (pkey_value) {
1242                     osrfLogDebug(
1243                     OSRF_LOG_MARK,
1244                     "Checking object permission [%s] for user %d on object %s (class %s) at org %d",
1245                     perm,
1246                     userid,
1247                     pkey_value,
1248                     osrfHashGet(class, "classname"),
1249                     atoi(context_org)
1250                 );
1251
1252                 result = dbi_conn_queryf(
1253                     writehandle,
1254                     "SELECT permission.usr_has_object_perm(%d, '%s', '%s', '%s', %d) AS has_perm;",
1255                     userid,
1256                     perm,
1257                     osrfHashGet(class, "classname"),
1258                     pkey_value,
1259                     atoi(context_org)
1260                 );
1261
1262                 if (result) {
1263                     osrfLogDebug(
1264                         OSRF_LOG_MARK,
1265                         "Received a result for object permission [%s] for user %d on object %s (class %s) at org %d",
1266                         perm,
1267                         userid,
1268                         pkey_value,
1269                         osrfHashGet(class, "classname"),
1270                         atoi(context_org)
1271                     );
1272
1273                     if (dbi_result_first_row(result)) {
1274                         jsonObject* return_val = oilsMakeJSONFromResult( result );
1275                                                 const char* has_perm = jsonObjectGetString( jsonObjectGetKeyConst(return_val, "has_perm") );
1276
1277                             osrfLogDebug(
1278                             OSRF_LOG_MARK,
1279                             "Status of object permission [%s] for user %d on object %s (class %s) at org %d is %s",
1280                             perm,
1281                             userid,
1282                             pkey_value,
1283                             osrfHashGet(class, "classname"),
1284                             atoi(context_org),
1285                             has_perm
1286                         );
1287
1288                         if ( *has_perm == 't' ) OK = 1;
1289                         jsonObjectFree(return_val);
1290                     }
1291
1292                     dbi_result_free(result);
1293                     if (OK) break;
1294                 }
1295             }
1296
1297                 osrfLogDebug( OSRF_LOG_MARK, "Checking non-object permission [%s] for user %d at org %d", perm, userid, atoi(context_org) );
1298             result = dbi_conn_queryf(
1299                 writehandle,
1300                 "SELECT permission.usr_has_perm(%d, '%s', %d) AS has_perm;",
1301                 userid,
1302                 perm,
1303                 atoi(context_org)
1304             );
1305
1306                         if (result) {
1307                                 osrfLogDebug( OSRF_LOG_MARK, "Received a result for permission [%s] for user %d at org %d",
1308                                                 perm, userid, atoi(context_org) );
1309                                 if ( dbi_result_first_row(result) ) {
1310                                         jsonObject* return_val = oilsMakeJSONFromResult( result );
1311                                         const char* has_perm = jsonObjectGetString( jsonObjectGetKeyConst(return_val, "has_perm") );
1312                                         osrfLogDebug( OSRF_LOG_MARK, "Status of permission [%s] for user %d at org %d is [%s]",
1313                                                         perm, userid, atoi(context_org), has_perm );
1314                                         if ( *has_perm == 't' ) OK = 1;
1315                                         jsonObjectFree(return_val);
1316                                 }
1317
1318                                 dbi_result_free(result);
1319                                 if (OK) break;
1320                         }
1321
1322         }
1323         if (OK) break;
1324     }
1325
1326     if (pkey_value) free(pkey_value);
1327     osrfStringArrayFree(context_org_array);
1328
1329     return OK;
1330 }
1331
1332 /**
1333  * Look up the root of the org_unit tree.  If you find it, return
1334  * a string containing the id, which the caller is responsible for freeing.
1335  * Otherwise return NULL.
1336  */
1337 static char* org_tree_root( osrfMethodContext* ctx ) {
1338
1339         static char cached_root_id[ 32 ] = "";  // extravagantly large buffer
1340         static time_t last_lookup_time = 0;
1341         time_t current_time = time( NULL );
1342
1343         if( cached_root_id[ 0 ] && ( current_time - last_lookup_time < 3600 ) ) {
1344                 // We successfully looked this up less than an hour ago.
1345                 // It's not likely to have changed since then.
1346                 return strdup( cached_root_id );
1347         }
1348         last_lookup_time = current_time;
1349
1350         int err = 0;
1351         jsonObject* where_clause = single_hash( "parent_ou", NULL );
1352         jsonObject* result = doFieldmapperSearch(
1353                 ctx, osrfHashGet( oilsIDL(), "aou" ), where_clause, NULL, &err );
1354         jsonObjectFree( where_clause );
1355
1356         jsonObject* tree_top = jsonObjectGetIndex( result, 0 );
1357
1358         if (! tree_top) {
1359                 jsonObjectFree( result );
1360
1361                 growing_buffer* msg = buffer_init(128);
1362                 OSRF_BUFFER_ADD( msg, MODULENAME );
1363                 OSRF_BUFFER_ADD( msg,
1364                                 ": Internal error, could not find the top of the org tree (parent_ou = NULL)" );
1365
1366                 char* m = buffer_release(msg);
1367                 osrfAppSessionStatus( ctx->session,
1368                                 OSRF_STATUS_INTERNALSERVERERROR, "osrfMethodException", ctx->request, m );
1369                 free(m);
1370
1371                 cached_root_id[ 0 ] = '\0';
1372                 return NULL;
1373         }
1374
1375         char* root_org_unit_id = oilsFMGetString( tree_top, "id" );
1376         osrfLogDebug( OSRF_LOG_MARK, "Top of the org tree is %s", root_org_unit_id );
1377
1378         jsonObjectFree( result );
1379
1380         strcpy( cached_root_id, root_org_unit_id );
1381         return root_org_unit_id;
1382 }
1383
1384 /**
1385 Utility function: create a JSON_HASH with a single key/value pair.
1386 This function is equivalent to:
1387
1388         jsonParseStringFmt( "{\"%s\":\"%s\"}", key, value )
1389
1390 or, if value is NULL:
1391
1392         jsonParseStringFmt( "{\"%s\":null}", key )
1393
1394 ...but faster because it doesn't create and parse a JSON string.
1395 */
1396 static jsonObject* single_hash( const char* key, const char* value ) {
1397         // Sanity check
1398         if( ! key ) key = "";
1399
1400         jsonObject* hash = jsonNewObjectType( JSON_HASH );
1401         jsonObjectSetKey( hash, key, jsonNewObject( value ) );
1402         return hash;
1403 }
1404 #endif
1405
1406
1407 static jsonObject* doCreate(osrfMethodContext* ctx, int* err ) {
1408
1409         osrfHash* meta = osrfHashGet( (osrfHash*) ctx->method->userData, "class" );
1410 #ifdef PCRUD
1411         jsonObject* target = jsonObjectGetIndex( ctx->params, 1 );
1412         jsonObject* options = jsonObjectGetIndex( ctx->params, 2 );
1413 #else
1414         jsonObject* target = jsonObjectGetIndex( ctx->params, 0 );
1415         jsonObject* options = jsonObjectGetIndex( ctx->params, 1 );
1416 #endif
1417
1418         if (!verifyObjectClass(ctx, target)) {
1419                 *err = -1;
1420                 return jsonNULL;
1421         }
1422
1423         osrfLogDebug( OSRF_LOG_MARK, "Object seems to be of the correct type" );
1424
1425         char* trans_id = NULL;
1426         if( ctx->session && ctx->session->userData )
1427                 trans_id = osrfHashGet( (osrfHash*)ctx->session->userData, "xact_id" );
1428
1429         if ( !trans_id ) {
1430                 osrfLogError( OSRF_LOG_MARK, "No active transaction -- required for CREATE" );
1431
1432                 osrfAppSessionStatus(
1433                         ctx->session,
1434                         OSRF_STATUS_BADREQUEST,
1435                         "osrfMethodException",
1436                         ctx->request,
1437                         "No active transaction -- required for CREATE"
1438                 );
1439                 *err = -1;
1440                 return jsonNULL;
1441         }
1442
1443         // The following test is harmless but redundant.  If a class is
1444         // readonly, we don't register a create method for it.
1445         if( str_is_true( osrfHashGet( meta, "readonly" ) ) ) {
1446                 osrfAppSessionStatus(
1447                         ctx->session,
1448                         OSRF_STATUS_BADREQUEST,
1449                         "osrfMethodException",
1450                         ctx->request,
1451                         "Cannot INSERT readonly class"
1452                 );
1453                 *err = -1;
1454                 return jsonNULL;
1455         }
1456
1457         // Set the last_xact_id
1458         int index = oilsIDL_ntop( target->classname, "last_xact_id" );
1459         if (index > -1) {
1460                 osrfLogDebug(OSRF_LOG_MARK, "Setting last_xact_id to %s on %s at position %d", trans_id, target->classname, index);
1461                 jsonObjectSetIndex(target, index, jsonNewObject(trans_id));
1462         }
1463
1464         osrfLogDebug( OSRF_LOG_MARK, "There is a transaction running..." );
1465
1466         dbhandle = writehandle;
1467
1468         osrfHash* fields = osrfHashGet(meta, "fields");
1469         char* pkey = osrfHashGet(meta, "primarykey");
1470         char* seq = osrfHashGet(meta, "sequence");
1471
1472         growing_buffer* table_buf = buffer_init(128);
1473         growing_buffer* col_buf = buffer_init(128);
1474         growing_buffer* val_buf = buffer_init(128);
1475
1476         OSRF_BUFFER_ADD(table_buf, "INSERT INTO ");
1477         OSRF_BUFFER_ADD(table_buf, osrfHashGet(meta, "tablename"));
1478         OSRF_BUFFER_ADD_CHAR( col_buf, '(' );
1479         buffer_add(val_buf,"VALUES (");
1480
1481
1482         int first = 1;
1483         osrfHash* field = NULL;
1484         osrfHashIterator* field_itr = osrfNewHashIterator( fields );
1485         while( (field = osrfHashIteratorNext( field_itr ) ) ) {
1486
1487                 const char* field_name = osrfHashIteratorKey( field_itr );
1488
1489                 if( str_is_true( osrfHashGet( field, "virtual" ) ) )
1490                         continue;
1491
1492                 const jsonObject* field_object = oilsFMGetObject( target, field_name );
1493
1494                 char* value;
1495                 if (field_object && field_object->classname) {
1496                         value = oilsFMGetString(
1497                                 field_object,
1498                                 (char*)oilsIDLFindPath("/%s/primarykey", field_object->classname)
1499                         );
1500                 } else {
1501                         value = jsonObjectToSimpleString( field_object );
1502                 }
1503
1504
1505                 if (first) {
1506                         first = 0;
1507                 } else {
1508                         OSRF_BUFFER_ADD_CHAR( col_buf, ',' );
1509                         OSRF_BUFFER_ADD_CHAR( val_buf, ',' );
1510                 }
1511
1512                 buffer_add(col_buf, field_name);
1513
1514                 if (!field_object || field_object->type == JSON_NULL) {
1515                         buffer_add( val_buf, "DEFAULT" );
1516
1517                 } else if ( !strcmp(get_primitive( field ), "number") ) {
1518                         const char* numtype = get_datatype( field );
1519                         if ( !strcmp( numtype, "INT8") ) {
1520                                 buffer_fadd( val_buf, "%lld", atoll(value) );
1521
1522                         } else if ( !strcmp( numtype, "INT") ) {
1523                                 buffer_fadd( val_buf, "%d", atoi(value) );
1524
1525                         } else if ( !strcmp( numtype, "NUMERIC") ) {
1526                                 buffer_fadd( val_buf, "%f", atof(value) );
1527                         }
1528                 } else {
1529                         if ( dbi_conn_quote_string(writehandle, &value) ) {
1530                                 OSRF_BUFFER_ADD( val_buf, value );
1531
1532                         } else {
1533                                 osrfLogError(OSRF_LOG_MARK, "%s: Error quoting string [%s]", MODULENAME, value);
1534                                 osrfAppSessionStatus(
1535                                         ctx->session,
1536                                         OSRF_STATUS_INTERNALSERVERERROR,
1537                                         "osrfMethodException",
1538                                         ctx->request,
1539                                         "Error quoting string -- please see the error log for more details"
1540                                 );
1541                                 free(value);
1542                                 buffer_free(table_buf);
1543                                 buffer_free(col_buf);
1544                                 buffer_free(val_buf);
1545                                 *err = -1;
1546                                 return jsonNULL;
1547                         }
1548                 }
1549
1550                 free(value);
1551
1552         }
1553
1554         osrfHashIteratorFree( field_itr );
1555
1556         OSRF_BUFFER_ADD_CHAR( col_buf, ')' );
1557         OSRF_BUFFER_ADD_CHAR( val_buf, ')' );
1558
1559         char* table_str = buffer_release(table_buf);
1560         char* col_str   = buffer_release(col_buf);
1561         char* val_str   = buffer_release(val_buf);
1562         growing_buffer* sql = buffer_init(128);
1563         buffer_fadd( sql, "%s %s %s;", table_str, col_str, val_str );
1564         free(table_str);
1565         free(col_str);
1566         free(val_str);
1567
1568         char* query = buffer_release(sql);
1569
1570         osrfLogDebug(OSRF_LOG_MARK, "%s: Insert SQL [%s]", MODULENAME, query);
1571
1572
1573         dbi_result result = dbi_conn_query(writehandle, query);
1574
1575         jsonObject* obj = NULL;
1576
1577         if (!result) {
1578                 obj = jsonNewObject(NULL);
1579                 osrfLogError(
1580                         OSRF_LOG_MARK,
1581                         "%s ERROR inserting %s object using query [%s]",
1582                         MODULENAME,
1583                         osrfHashGet(meta, "fieldmapper"),
1584                         query
1585                 );
1586                 osrfAppSessionStatus(
1587                         ctx->session,
1588                         OSRF_STATUS_INTERNALSERVERERROR,
1589                         "osrfMethodException",
1590                         ctx->request,
1591                         "INSERT error -- please see the error log for more details"
1592                 );
1593                 *err = -1;
1594         } else {
1595
1596                 char* id = oilsFMGetString(target, pkey);
1597                 if (!id) {
1598                         unsigned long long new_id = dbi_conn_sequence_last(writehandle, seq);
1599                         growing_buffer* _id = buffer_init(10);
1600                         buffer_fadd(_id, "%lld", new_id);
1601                         id = buffer_release(_id);
1602                 }
1603
1604                 // Find quietness specification, if present
1605                 const char* quiet_str = NULL;
1606                 if ( options ) {
1607                         const jsonObject* quiet_obj = jsonObjectGetKeyConst( options, "quiet" );
1608                         if( quiet_obj )
1609                                 quiet_str = jsonObjectGetString( quiet_obj );
1610                 }
1611
1612                 if( str_is_true( quiet_str ) ) {  // if quietness is specified
1613                         obj = jsonNewObject(id);
1614                 }
1615                 else {
1616
1617                         jsonObject* where_clause = jsonNewObjectType( JSON_HASH );
1618                         jsonObjectSetKey( where_clause, pkey, jsonNewObject(id) );
1619
1620                         jsonObject* list = doFieldmapperSearch( ctx, meta, where_clause, NULL, err );
1621
1622                         jsonObjectFree( where_clause );
1623
1624                         if(*err) {
1625                                 obj = jsonNULL;
1626                         } else {
1627                                 obj = jsonObjectClone( jsonObjectGetIndex(list, 0) );
1628                         }
1629
1630                         jsonObjectFree( list );
1631                 }
1632
1633                 free(id);
1634         }
1635
1636         free(query);
1637
1638         return obj;
1639
1640 }
1641
1642 /*
1643  * Fetch one row from a specified table, using a specified value
1644  * for the primary key
1645 */
1646 static jsonObject* doRetrieve(osrfMethodContext* ctx, int* err ) {
1647
1648     int id_pos = 0;
1649     int order_pos = 1;
1650
1651 #ifdef PCRUD
1652     id_pos = 1;
1653     order_pos = 2;
1654 #endif
1655
1656         osrfHash* class_def = osrfHashGet( (osrfHash*) ctx->method->userData, "class" );
1657
1658         const jsonObject* id_obj = jsonObjectGetIndex(ctx->params, id_pos);  // key value
1659
1660         osrfLogDebug(
1661                 OSRF_LOG_MARK,
1662                 "%s retrieving %s object with primary key value of %s",
1663                 MODULENAME,
1664                 osrfHashGet( class_def, "fieldmapper" ),
1665                 jsonObjectGetString( id_obj )
1666         );
1667
1668         // Build a WHERE clause based on the key value
1669         jsonObject* where_clause = jsonNewObjectType( JSON_HASH );
1670         jsonObjectSetKey(
1671                 where_clause,
1672                 osrfHashGet( class_def, "primarykey" ),
1673                 jsonObjectClone( id_obj )
1674         );
1675
1676         jsonObject* rest_of_query = jsonObjectGetIndex(ctx->params, order_pos);
1677
1678         jsonObject* list = doFieldmapperSearch( ctx, class_def, where_clause, rest_of_query, err );
1679
1680         jsonObjectFree( where_clause );
1681         if(*err)
1682                 return jsonNULL;
1683
1684         jsonObject* obj = jsonObjectExtractIndex( list, 0 );
1685         jsonObjectFree( list );
1686
1687 #ifdef PCRUD
1688         if(!verifyObjectPCRUD(ctx, obj)) {
1689         jsonObjectFree(obj);
1690         *err = -1;
1691
1692         growing_buffer* msg = buffer_init(128);
1693                 OSRF_BUFFER_ADD( msg, MODULENAME );
1694                 OSRF_BUFFER_ADD( msg, ": Insufficient permissions to retrieve object" );
1695
1696         char* m = buffer_release(msg);
1697         osrfAppSessionStatus( ctx->session, OSRF_STATUS_NOTALLOWED, "osrfMethodException", ctx->request, m );
1698
1699         free(m);
1700
1701                 return jsonNULL;
1702         }
1703 #endif
1704
1705         return obj;
1706 }
1707
1708 static char* jsonNumberToDBString ( osrfHash* field, const jsonObject* value ) {
1709         growing_buffer* val_buf = buffer_init(32);
1710         const char* numtype = get_datatype( field );
1711
1712         if ( !strncmp( numtype, "INT", 3 ) ) {
1713                 if (value->type == JSON_NUMBER)
1714                         //buffer_fadd( val_buf, "%ld", (long)jsonObjectGetNumber(value) );
1715                         buffer_fadd( val_buf, jsonObjectGetString( value ) );
1716                 else {
1717                         //const char* val_str = jsonObjectGetString( value );
1718                         //buffer_fadd( val_buf, "%ld", atol(val_str) );
1719                         buffer_fadd( val_buf, jsonObjectGetString( value ) );
1720                 }
1721
1722         } else if ( !strcmp( numtype, "NUMERIC" ) ) {
1723                 if (value->type == JSON_NUMBER)
1724                         //buffer_fadd( val_buf, "%f",  jsonObjectGetNumber(value) );
1725                         buffer_fadd( val_buf, jsonObjectGetString( value ) );
1726                 else {
1727                         //const char* val_str = jsonObjectGetString( value );
1728                         //buffer_fadd( val_buf, "%f", atof(val_str) );
1729                         buffer_fadd( val_buf, jsonObjectGetString( value ) );
1730                 }
1731
1732         } else {
1733                 // Presumably this was really intended ot be a string, so quote it
1734                 char* str = jsonObjectToSimpleString( value );
1735                 if ( dbi_conn_quote_string(dbhandle, &str) ) {
1736                         OSRF_BUFFER_ADD( val_buf, str );
1737                         free(str);
1738                 } else {
1739                         osrfLogError(OSRF_LOG_MARK, "%s: Error quoting key string [%s]", MODULENAME, str);
1740                         free(str);
1741                         buffer_free(val_buf);
1742                         return NULL;
1743                 }
1744         }
1745
1746         return buffer_release(val_buf);
1747 }
1748
1749 static char* searchINPredicate (const char* class_alias, osrfHash* field,
1750                 jsonObject* node, const char* op, osrfMethodContext* ctx ) {
1751         growing_buffer* sql_buf = buffer_init(32);
1752
1753         buffer_fadd(
1754                 sql_buf,
1755                 "\"%s\".%s ",
1756                 class_alias,
1757                 osrfHashGet(field, "name")
1758         );
1759
1760         if (!op) {
1761                 buffer_add(sql_buf, "IN (");
1762         } else if (!(strcasecmp(op,"not in"))) {
1763                 buffer_add(sql_buf, "NOT IN (");
1764         } else {
1765                 buffer_add(sql_buf, "IN (");
1766         }
1767
1768     if (node->type == JSON_HASH) {
1769         // subquery predicate
1770         char* subpred = SELECT(
1771             ctx,
1772             jsonObjectGetKey( node, "select" ),
1773             jsonObjectGetKey( node, "from" ),
1774             jsonObjectGetKey( node, "where" ),
1775             jsonObjectGetKey( node, "having" ),
1776             jsonObjectGetKey( node, "order_by" ),
1777             jsonObjectGetKey( node, "limit" ),
1778             jsonObjectGetKey( node, "offset" ),
1779             SUBSELECT
1780         );
1781                 pop_query_frame();
1782
1783                 if( subpred ) {
1784                         buffer_add(sql_buf, subpred);
1785                         free(subpred);
1786                 } else {
1787                         buffer_free( sql_buf );
1788                         return NULL;
1789                 }
1790
1791     } else if (node->type == JSON_ARRAY) {
1792         // literal value list
1793         int in_item_index = 0;
1794         int in_item_first = 1;
1795         const jsonObject* in_item;
1796         while ( (in_item = jsonObjectGetIndex(node, in_item_index++)) ) {
1797
1798                         if (in_item_first)
1799                                 in_item_first = 0;
1800                         else
1801                                 buffer_add(sql_buf, ", ");
1802
1803                         // Sanity check
1804                         if ( in_item->type != JSON_STRING && in_item->type != JSON_NUMBER ) {
1805                                 osrfLogError(OSRF_LOG_MARK, "%s: Expected string or number within IN list; found %s",
1806                                                 MODULENAME, json_type( in_item->type ) );
1807                                 buffer_free(sql_buf);
1808                                 return NULL;
1809                         }
1810
1811                         // Append the literal value -- quoted if not a number
1812                         if ( JSON_NUMBER == in_item->type ) {
1813                                 char* val = jsonNumberToDBString( field, in_item );
1814                                 OSRF_BUFFER_ADD( sql_buf, val );
1815                                 free(val);
1816
1817                         } else if ( !strcmp( get_primitive( field ), "number") ) {
1818                                 char* val = jsonNumberToDBString( field, in_item );
1819                                 OSRF_BUFFER_ADD( sql_buf, val );
1820                                 free(val);
1821
1822                         } else {
1823                                 char* key_string = jsonObjectToSimpleString(in_item);
1824                                 if ( dbi_conn_quote_string(dbhandle, &key_string) ) {
1825                                         OSRF_BUFFER_ADD( sql_buf, key_string );
1826                                         free(key_string);
1827                                 } else {
1828                                         osrfLogError(OSRF_LOG_MARK, "%s: Error quoting key string [%s]", MODULENAME, key_string);
1829                                         free(key_string);
1830                                         buffer_free(sql_buf);
1831                                         return NULL;
1832                                 }
1833                         }
1834                 }
1835
1836                 if( in_item_first ) {
1837                         osrfLogError(OSRF_LOG_MARK, "%s: Empty IN list", MODULENAME );
1838                         buffer_free( sql_buf );
1839                         return NULL;
1840                 }
1841         } else {
1842                 osrfLogError(OSRF_LOG_MARK, "%s: Expected object or array for IN clause; found %s",
1843                         MODULENAME, json_type( node->type ) );
1844                 buffer_free(sql_buf);
1845                 return NULL;
1846         }
1847
1848         OSRF_BUFFER_ADD_CHAR( sql_buf, ')' );
1849
1850         return buffer_release(sql_buf);
1851 }
1852
1853 // Receive a JSON_ARRAY representing a function call.  The first
1854 // entry in the array is the function name.  The rest are parameters.
1855 static char* searchValueTransform( const jsonObject* array ) {
1856
1857         if( array->size < 1 ) {
1858                 osrfLogError(OSRF_LOG_MARK, "%s: Empty array for value transform", MODULENAME);
1859                 return NULL;
1860         }
1861
1862         // Get the function name
1863         jsonObject* func_item = jsonObjectGetIndex( array, 0 );
1864         if( func_item->type != JSON_STRING ) {
1865                 osrfLogError(OSRF_LOG_MARK, "%s: Error: expected function name, found %s",
1866                         MODULENAME, json_type( func_item->type ) );
1867                 return NULL;
1868         }
1869
1870         growing_buffer* sql_buf = buffer_init(32);
1871
1872         OSRF_BUFFER_ADD( sql_buf, jsonObjectGetString( func_item ) );
1873         OSRF_BUFFER_ADD( sql_buf, "( " );
1874
1875         // Get the parameters
1876         int func_item_index = 1;   // We already grabbed the zeroth entry
1877         while ( (func_item = jsonObjectGetIndex(array, func_item_index++)) ) {
1878
1879                 // Add a separator comma, if we need one
1880                 if( func_item_index > 2 )
1881                         buffer_add( sql_buf, ", " );
1882
1883                 // Add the current parameter
1884                 if (func_item->type == JSON_NULL) {
1885                         buffer_add( sql_buf, "NULL" );
1886                 } else {
1887                         char* val = jsonObjectToSimpleString(func_item);
1888                         if ( dbi_conn_quote_string(dbhandle, &val) ) {
1889                                 OSRF_BUFFER_ADD( sql_buf, val );
1890                                 free(val);
1891                         } else {
1892                                 osrfLogError(OSRF_LOG_MARK, "%s: Error quoting key string [%s]", MODULENAME, val);
1893                                 buffer_free(sql_buf);
1894                                 free(val);
1895                                 return NULL;
1896                         }
1897                 }
1898         }
1899
1900         buffer_add( sql_buf, " )" );
1901
1902         return buffer_release(sql_buf);
1903 }
1904
1905 static char* searchFunctionPredicate (const char* class_alias, osrfHash* field,
1906                 const jsonObject* node, const char* op) {
1907
1908         if( ! is_good_operator( op ) ) {
1909                 osrfLogError( OSRF_LOG_MARK, "%s: Invalid operator [%s]", MODULENAME, op );
1910                 return NULL;
1911         }
1912
1913         char* val = searchValueTransform(node);
1914         if( !val )
1915                 return NULL;
1916
1917         growing_buffer* sql_buf = buffer_init(32);
1918         buffer_fadd(
1919                 sql_buf,
1920                 "\"%s\".%s %s %s",
1921                 class_alias,
1922                 osrfHashGet(field, "name"),
1923                 op,
1924                 val
1925         );
1926
1927         free(val);
1928
1929         return buffer_release(sql_buf);
1930 }
1931
1932 // class_alias is a class name or other table alias
1933 // field is a field definition as stored in the IDL
1934 // node comes from the method parameter, and may represent an entry in the SELECT list
1935 static char* searchFieldTransform (const char* class_alias, osrfHash* field, const jsonObject* node) {
1936         growing_buffer* sql_buf = buffer_init(32);
1937
1938         const char* field_transform = jsonObjectGetString( jsonObjectGetKeyConst( node, "transform" ) );
1939         const char* transform_subcolumn = jsonObjectGetString( jsonObjectGetKeyConst( node, "result_field" ) );
1940
1941         if(transform_subcolumn) {
1942                 if( ! is_identifier( transform_subcolumn ) ) {
1943                         osrfLogError( OSRF_LOG_MARK, "%s: Invalid subfield name: \"%s\"\n",
1944                                         MODULENAME, transform_subcolumn );
1945                         buffer_free( sql_buf );
1946                         return NULL;
1947                 }
1948                 OSRF_BUFFER_ADD_CHAR( sql_buf, '(' );    // enclose transform in parentheses
1949         }
1950
1951         if (field_transform) {
1952
1953                 if( ! is_identifier( field_transform ) ) {
1954                         osrfLogError( OSRF_LOG_MARK, "%s: Expected function name, found \"%s\"\n",
1955                                         MODULENAME, field_transform );
1956                         buffer_free( sql_buf );
1957                         return NULL;
1958                 }
1959
1960                 buffer_fadd( sql_buf, "%s(\"%s\".%s", field_transform, class_alias, osrfHashGet(field, "name"));
1961                 const jsonObject* array = jsonObjectGetKeyConst( node, "params" );
1962
1963                 if (array) {
1964                         if( array->type != JSON_ARRAY ) {
1965                                 osrfLogError( OSRF_LOG_MARK,
1966                                         "%s: Expected JSON_ARRAY for function params; found %s",
1967                                         MODULENAME, json_type( array->type ) );
1968                                 buffer_free( sql_buf );
1969                                 return NULL;
1970                         }
1971                         int func_item_index = 0;
1972                         jsonObject* func_item;
1973                         while ( (func_item = jsonObjectGetIndex(array, func_item_index++)) ) {
1974
1975                                 char* val = jsonObjectToSimpleString(func_item);
1976
1977                                 if ( !val ) {
1978                                         buffer_add( sql_buf, ",NULL" );
1979                                 } else if ( dbi_conn_quote_string(dbhandle, &val) ) {
1980                                         OSRF_BUFFER_ADD_CHAR( sql_buf, ',' );
1981                                         OSRF_BUFFER_ADD( sql_buf, val );
1982                                 } else {
1983                                         osrfLogError(OSRF_LOG_MARK, "%s: Error quoting key string [%s]", MODULENAME, val);
1984                                         free(val);
1985                                         buffer_free(sql_buf);
1986                                         return NULL;
1987                         }
1988                                 free(val);
1989                         }
1990                 }
1991
1992                 buffer_add( sql_buf, " )" );
1993
1994         } else {
1995                 buffer_fadd( sql_buf, "\"%s\".%s", class_alias, osrfHashGet(field, "name"));
1996         }
1997
1998         if (transform_subcolumn)
1999                 buffer_fadd( sql_buf, ").\"%s\"", transform_subcolumn );
2000
2001         return buffer_release(sql_buf);
2002 }
2003
2004 static char* searchFieldTransformPredicate( const ClassInfo* class_info, osrfHash* field,
2005                 const jsonObject* node, const char* op ) {
2006
2007         if( ! is_good_operator( op ) ) {
2008                 osrfLogError(OSRF_LOG_MARK, "%s: Error: Invalid operator %s", MODULENAME, op);
2009                 return NULL;
2010         }
2011
2012         char* field_transform = searchFieldTransform( class_info->alias, field, node );
2013         if( ! field_transform )
2014                 return NULL;
2015         char* value = NULL;
2016         int extra_parens = 0;   // boolean
2017
2018         const jsonObject* value_obj = jsonObjectGetKeyConst( node, "value" );
2019         if ( ! value_obj ) {
2020                 value = searchWHERE( node, class_info, AND_OP_JOIN, NULL );
2021                 if( !value ) {
2022                         osrfLogError(OSRF_LOG_MARK, "%s: Error building condition for field transform", MODULENAME);
2023                         free(field_transform);
2024                         return NULL;
2025                 }
2026                 extra_parens = 1;
2027         } else if ( value_obj->type == JSON_ARRAY ) {
2028                 value = searchValueTransform( value_obj );
2029                 if( !value ) {
2030                         osrfLogError(OSRF_LOG_MARK, "%s: Error building value transform for field transform", MODULENAME);
2031                         free( field_transform );
2032                         return NULL;
2033                 }
2034         } else if ( value_obj->type == JSON_HASH ) {
2035                 value = searchWHERE( value_obj, class_info, AND_OP_JOIN, NULL );
2036                 if( !value ) {
2037                         osrfLogError(OSRF_LOG_MARK, "%s: Error building predicate for field transform", MODULENAME);
2038                         free(field_transform);
2039                         return NULL;
2040                 }
2041                 extra_parens = 1;
2042         } else if ( value_obj->type == JSON_NUMBER ) {
2043                 value = jsonNumberToDBString( field, value_obj );
2044         } else if ( value_obj->type == JSON_NULL ) {
2045                 osrfLogError(OSRF_LOG_MARK, "%s: Error building predicate for field transform: null value", MODULENAME);
2046                 free(field_transform);
2047                 return NULL;
2048         } else if ( value_obj->type == JSON_BOOL ) {
2049                 osrfLogError(OSRF_LOG_MARK, "%s: Error building predicate for field transform: boolean value", MODULENAME);
2050                 free(field_transform);
2051                 return NULL;
2052         } else {
2053                 if ( !strcmp( get_primitive( field ), "number") ) {
2054                         value = jsonNumberToDBString( field, value_obj );
2055                 } else {
2056                         value = jsonObjectToSimpleString( value_obj );
2057                         if ( !dbi_conn_quote_string(dbhandle, &value) ) {
2058                                 osrfLogError(OSRF_LOG_MARK, "%s: Error quoting key string [%s]", MODULENAME, value);
2059                                 free(value);
2060                                 free(field_transform);
2061                                 return NULL;
2062                         }
2063                 }
2064         }
2065
2066         const char* left_parens  = "";
2067         const char* right_parens = "";
2068
2069         if( extra_parens ) {
2070                 left_parens  = "(";
2071                 right_parens = ")";
2072         }
2073
2074         growing_buffer* sql_buf = buffer_init(32);
2075
2076         buffer_fadd(
2077                 sql_buf,
2078                 "%s%s %s %s %s %s%s",
2079                 left_parens,
2080                 field_transform,
2081                 op,
2082                 left_parens,
2083                 value,
2084                 right_parens,
2085                 right_parens
2086         );
2087
2088         free(value);
2089         free(field_transform);
2090
2091         return buffer_release(sql_buf);
2092 }
2093
2094 static char* searchSimplePredicate (const char* op, const char* class_alias,
2095                 osrfHash* field, const jsonObject* node) {
2096
2097         if( ! is_good_operator( op ) ) {
2098                 osrfLogError( OSRF_LOG_MARK, "%s: Invalid operator [%s]", MODULENAME, op );
2099                 return NULL;
2100         }
2101
2102         char* val = NULL;
2103
2104         // Get the value to which we are comparing the specified column
2105         if (node->type != JSON_NULL) {
2106                 if ( node->type == JSON_NUMBER ) {
2107                         val = jsonNumberToDBString( field, node );
2108                 } else if ( !strcmp( get_primitive( field ), "number" ) ) {
2109                         val = jsonNumberToDBString( field, node );
2110                 } else {
2111                         val = jsonObjectToSimpleString(node);
2112                 }
2113         }
2114
2115         if( val ) {
2116                 if( JSON_NUMBER != node->type && strcmp( get_primitive( field ), "number") ) {
2117                         // Value is not numeric; enclose it in quotes
2118                         if ( !dbi_conn_quote_string( dbhandle, &val ) ) {
2119                                 osrfLogError( OSRF_LOG_MARK, "%s: Error quoting key string [%s]", MODULENAME, val );
2120                                 free( val );
2121                                 return NULL;
2122                         }
2123                 }
2124         } else {
2125                 // Compare to a null value
2126                 val = strdup( "NULL" );
2127                 if (strcmp( op, "=" ))
2128                         op = "IS NOT";
2129                 else
2130                         op = "IS";
2131         }
2132
2133         growing_buffer* sql_buf = buffer_init(32);
2134         buffer_fadd( sql_buf, "\"%s\".%s %s %s", class_alias, osrfHashGet(field, "name"), op, val );
2135         char* pred = buffer_release( sql_buf );
2136
2137         free(val);
2138
2139         return pred;
2140 }
2141
2142 static char* searchBETWEENPredicate (const char* class_alias,
2143                 osrfHash* field, const jsonObject* node) {
2144
2145         const jsonObject* x_node = jsonObjectGetIndex( node, 0 );
2146         const jsonObject* y_node = jsonObjectGetIndex( node, 1 );
2147
2148         if( NULL == y_node ) {
2149                 osrfLogError( OSRF_LOG_MARK, "%s: Not enough operands for BETWEEN operator", MODULENAME );
2150                 return NULL;
2151         }
2152         else if( NULL != jsonObjectGetIndex( node, 2 ) ) {
2153                 osrfLogError( OSRF_LOG_MARK, "%s: Too many operands for BETWEEN operator", MODULENAME );
2154                 return NULL;
2155         }
2156
2157         char* x_string;
2158         char* y_string;
2159
2160         if ( !strcmp( get_primitive( field ), "number") ) {
2161                 x_string = jsonNumberToDBString(field, x_node);
2162                 y_string = jsonNumberToDBString(field, y_node);
2163
2164         } else {
2165                 x_string = jsonObjectToSimpleString(x_node);
2166                 y_string = jsonObjectToSimpleString(y_node);
2167                 if ( !(dbi_conn_quote_string(dbhandle, &x_string) && dbi_conn_quote_string(dbhandle, &y_string)) ) {
2168                         osrfLogError(OSRF_LOG_MARK, "%s: Error quoting key strings [%s] and [%s]",
2169                                         MODULENAME, x_string, y_string);
2170                         free(x_string);
2171                         free(y_string);
2172                         return NULL;
2173                 }
2174         }
2175
2176         growing_buffer* sql_buf = buffer_init(32);
2177         buffer_fadd( sql_buf, "\"%s\".%s BETWEEN %s AND %s",
2178                         class_alias, osrfHashGet(field, "name"), x_string, y_string );
2179         free(x_string);
2180         free(y_string);
2181
2182         return buffer_release(sql_buf);
2183 }
2184
2185 static char* searchPredicate ( const ClassInfo* class_info, osrfHash* field,
2186                                                            jsonObject* node, osrfMethodContext* ctx ) {
2187
2188         char* pred = NULL;
2189         if (node->type == JSON_ARRAY) { // equality IN search
2190                 pred = searchINPredicate( class_info->alias, field, node, NULL, ctx );
2191         } else if (node->type == JSON_HASH) { // other search
2192                 jsonIterator* pred_itr = jsonNewIterator( node );
2193                 if( !jsonIteratorHasNext( pred_itr ) ) {
2194                         osrfLogError( OSRF_LOG_MARK, "%s: Empty predicate for field \"%s\"",
2195                                         MODULENAME, osrfHashGet(field, "name") );
2196                 } else {
2197                         jsonObject* pred_node = jsonIteratorNext( pred_itr );
2198
2199                         // Verify that there are no additional predicates
2200                         if( jsonIteratorHasNext( pred_itr ) ) {
2201                                 osrfLogError( OSRF_LOG_MARK, "%s: Multiple predicates for field \"%s\"",
2202                                                 MODULENAME, osrfHashGet(field, "name") );
2203                         } else if ( !(strcasecmp( pred_itr->key,"between" )) )
2204                                 pred = searchBETWEENPredicate( class_info->alias, field, pred_node );
2205                         else if ( !(strcasecmp( pred_itr->key,"in" )) || !(strcasecmp( pred_itr->key,"not in" )) )
2206                                 pred = searchINPredicate( class_info->alias, field, pred_node, pred_itr->key, ctx );
2207                         else if ( pred_node->type == JSON_ARRAY )
2208                                 pred = searchFunctionPredicate( class_info->alias, field, pred_node, pred_itr->key );
2209                         else if ( pred_node->type == JSON_HASH )
2210                                 pred = searchFieldTransformPredicate( class_info, field, pred_node, pred_itr->key );
2211                         else
2212                                 pred = searchSimplePredicate( pred_itr->key, class_info->alias, field, pred_node );
2213                 }
2214                 jsonIteratorFree(pred_itr);
2215
2216         } else if (node->type == JSON_NULL) { // IS NULL search
2217                 growing_buffer* _p = buffer_init(64);
2218                 buffer_fadd(
2219                         _p,
2220                         "\"%s\".%s IS NULL",
2221                         class_info->class_name,
2222                         osrfHashGet(field, "name")
2223                 );
2224                 pred = buffer_release(_p);
2225         } else { // equality search
2226                 pred = searchSimplePredicate( "=", class_info->alias, field, node );
2227         }
2228
2229         return pred;
2230
2231 }
2232
2233
2234 /*
2235
2236 join : {
2237         acn : {
2238                 field : record,
2239                 fkey : id
2240                 type : left
2241                 filter_op : or
2242                 filter : { ... },
2243                 join : {
2244                         acp : {
2245                                 field : call_number,
2246                                 fkey : id,
2247                                 filter : { ... },
2248                         },
2249                 },
2250         },
2251         mrd : {
2252                 field : record,
2253                 type : inner
2254                 fkey : id,
2255                 filter : { ... },
2256         }
2257 }
2258
2259 */
2260
2261 static char* searchJOIN ( const jsonObject* join_hash, const ClassInfo* left_info ) {
2262
2263         const jsonObject* working_hash;
2264         jsonObject* freeable_hash = NULL;
2265
2266         if (join_hash->type == JSON_HASH) {
2267                 working_hash = join_hash;
2268         } else if (join_hash->type == JSON_STRING) {
2269                 // turn it into a JSON_HASH by creating a wrapper
2270                 // around a copy of the original
2271                 const char* _tmp = jsonObjectGetString( join_hash );
2272                 freeable_hash = jsonNewObjectType(JSON_HASH);
2273                 jsonObjectSetKey(freeable_hash, _tmp, NULL);
2274                 working_hash = freeable_hash;
2275         } else {
2276                 osrfLogError(
2277                         OSRF_LOG_MARK,
2278                         "%s: JOIN failed; expected JSON object type not found",
2279                         MODULENAME
2280                 );
2281                 return NULL;
2282         }
2283
2284         growing_buffer* join_buf = buffer_init(128);
2285         const char* leftclass = left_info->class_name;
2286
2287         jsonObject* snode = NULL;
2288         jsonIterator* search_itr = jsonNewIterator( working_hash );
2289
2290         while ( (snode = jsonIteratorNext( search_itr )) ) {
2291                 const char* right_alias = search_itr->key;
2292                 const char* class =
2293                                 jsonObjectGetString( jsonObjectGetKeyConst( snode, "class" ) );
2294                 if( ! class )
2295                         class = right_alias;
2296
2297                 const ClassInfo* right_info = add_joined_class( right_alias, class );
2298                 if( !right_info ) {
2299                         osrfLogError(
2300                                 OSRF_LOG_MARK,
2301                                 "%s: JOIN failed.  Class \"%s\" not resolved in IDL",
2302                                 MODULENAME,
2303                                 search_itr->key
2304                         );
2305                         jsonIteratorFree( search_itr );
2306                         buffer_free( join_buf );
2307                         if( freeable_hash )
2308                                 jsonObjectFree( freeable_hash );
2309                         return NULL;
2310                 }
2311                 osrfHash* links    = right_info->links;
2312                 const char* table  = right_info->source_def;
2313
2314                 const char* fkey  = jsonObjectGetString( jsonObjectGetKeyConst( snode, "fkey" ) );
2315                 const char* field = jsonObjectGetString( jsonObjectGetKeyConst( snode, "field" ) );
2316
2317                 if (field && !fkey) {
2318                         // Look up the corresponding join column in the IDL.
2319                         // The link must be defined in the child table,
2320                         // and point to the right parent table.
2321                         osrfHash* idl_link = (osrfHash*) osrfHashGet( links, field );
2322                         const char* reltype = NULL;
2323                         const char* other_class = NULL;
2324                         reltype = osrfHashGet( idl_link, "reltype" );
2325                         if( reltype && strcmp( reltype, "has_many" ) )
2326                                 other_class = osrfHashGet( idl_link, "class" );
2327                         if( other_class && !strcmp( other_class, leftclass ) )
2328                                 fkey = osrfHashGet( idl_link, "key" );
2329                         if (!fkey) {
2330                                 osrfLogError(
2331                                         OSRF_LOG_MARK,
2332                                         "%s: JOIN failed.  No link defined from %s.%s to %s",
2333                                         MODULENAME,
2334                                         class,
2335                                         field,
2336                                         leftclass
2337                                 );
2338                                 buffer_free(join_buf);
2339                                 if(freeable_hash)
2340                                         jsonObjectFree(freeable_hash);
2341                                 jsonIteratorFree(search_itr);
2342                                 return NULL;
2343                         }
2344
2345                 } else if (!field && fkey) {
2346                         // Look up the corresponding join column in the IDL.
2347                         // The link must be defined in the child table,
2348                         // and point to the right parent table.
2349                         osrfHash* left_links = left_info->links;
2350                         osrfHash* idl_link = (osrfHash*) osrfHashGet( left_links, fkey );
2351                         const char* reltype = NULL;
2352                         const char* other_class = NULL;
2353                         reltype = osrfHashGet( idl_link, "reltype" );
2354                         if( reltype && strcmp( reltype, "has_many" ) )
2355                                 other_class = osrfHashGet( idl_link, "class" );
2356                         if( other_class && !strcmp( other_class, class ) )
2357                                 field = osrfHashGet( idl_link, "key" );
2358                         if (!field) {
2359                                 osrfLogError(
2360                                         OSRF_LOG_MARK,
2361                                         "%s: JOIN failed.  No link defined from %s.%s to %s",
2362                                         MODULENAME,
2363                                         leftclass,
2364                                         fkey,
2365                                         class
2366                                 );
2367                                 buffer_free(join_buf);
2368                                 if(freeable_hash)
2369                                         jsonObjectFree(freeable_hash);
2370                                 jsonIteratorFree(search_itr);
2371                                 return NULL;
2372                         }
2373
2374                 } else if (!field && !fkey) {
2375                         osrfHash* left_links = left_info->links;
2376
2377                         // For each link defined for the left class:
2378                         // see if the link references the joined class
2379                         osrfHashIterator* itr = osrfNewHashIterator( left_links );
2380                         osrfHash* curr_link = NULL;
2381                         while( (curr_link = osrfHashIteratorNext( itr ) ) ) {
2382                                 const char* other_class = osrfHashGet( curr_link, "class" );
2383                                 if( other_class && !strcmp( other_class, class ) ) {
2384
2385                                         // In the IDL, the parent class doesn't know then names of the child
2386                                         // columns that are pointing to it, so don't use that end of the link
2387                                         const char* reltype = osrfHashGet( curr_link, "reltype" );
2388                                         if( reltype && strcmp( reltype, "has_many" ) ) {
2389                                                 // Found a link between the classes
2390                                                 fkey = osrfHashIteratorKey( itr );
2391                                                 field = osrfHashGet( curr_link, "key" );
2392                                                 break;
2393                                         }
2394                                 }
2395                         }
2396                         osrfHashIteratorFree( itr );
2397
2398                         if (!field || !fkey) {
2399                                 // Do another such search, with the classes reversed
2400
2401                                 // For each link defined for the joined class:
2402                                 // see if the link references the left class
2403                                 osrfHashIterator* itr = osrfNewHashIterator( links );
2404                                 osrfHash* curr_link = NULL;
2405                                 while( (curr_link = osrfHashIteratorNext( itr ) ) ) {
2406                                         const char* other_class = osrfHashGet( curr_link, "class" );
2407                                         if( other_class && !strcmp( other_class, leftclass ) ) {
2408
2409                                                 // In the IDL, the parent class doesn't know then names of the child
2410                                                 // columns that are pointing to it, so don't use that end of the link
2411                                                 const char* reltype = osrfHashGet( curr_link, "reltype" );
2412                                                 if( reltype && strcmp( reltype, "has_many" ) ) {
2413                                                         // Found a link between the classes
2414                                                         field = osrfHashIteratorKey( itr );
2415                                                         fkey = osrfHashGet( curr_link, "key" );
2416                                                         break;
2417                                                 }
2418                                         }
2419                                 }
2420                                 osrfHashIteratorFree( itr );
2421                         }
2422
2423                         if (!field || !fkey) {
2424                                 osrfLogError(
2425                                         OSRF_LOG_MARK,
2426                                         "%s: JOIN failed.  No link defined between %s and %s",
2427                                         MODULENAME,
2428                                         leftclass,
2429                                         class
2430                                 );
2431                                 buffer_free(join_buf);
2432                                 if(freeable_hash)
2433                                         jsonObjectFree(freeable_hash);
2434                                 jsonIteratorFree(search_itr);
2435                                 return NULL;
2436                         }
2437
2438                 }
2439
2440                 const char* type = jsonObjectGetString( jsonObjectGetKeyConst( snode, "type" ) );
2441                 if (type) {
2442                         if ( !strcasecmp(type,"left") ) {
2443                                 buffer_add(join_buf, " LEFT JOIN");
2444                         } else if ( !strcasecmp(type,"right") ) {
2445                                 buffer_add(join_buf, " RIGHT JOIN");
2446                         } else if ( !strcasecmp(type,"full") ) {
2447                                 buffer_add(join_buf, " FULL JOIN");
2448                         } else {
2449                                 buffer_add(join_buf, " INNER JOIN");
2450                         }
2451                 } else {
2452                         buffer_add(join_buf, " INNER JOIN");
2453                 }
2454
2455                 buffer_fadd(join_buf, " %s AS \"%s\" ON ( \"%s\".%s = \"%s\".%s",
2456                                         table, right_alias, right_alias, field, left_info->alias, fkey);
2457
2458                 // Add any other join conditions as specified by "filter"
2459                 const jsonObject* filter = jsonObjectGetKeyConst( snode, "filter" );
2460                 if (filter) {
2461                         const char* filter_op = jsonObjectGetString( jsonObjectGetKeyConst( snode, "filter_op" ) );
2462                         if ( filter_op && !strcasecmp("or",filter_op) ) {
2463                                 buffer_add( join_buf, " OR " );
2464                         } else {
2465                                 buffer_add( join_buf, " AND " );
2466                         }
2467
2468                         char* jpred = searchWHERE( filter, right_info, AND_OP_JOIN, NULL );
2469                         if( jpred ) {
2470                                 OSRF_BUFFER_ADD_CHAR( join_buf, ' ' );
2471                                 OSRF_BUFFER_ADD( join_buf, jpred );
2472                                 free(jpred);
2473                         } else {
2474                                 osrfLogError(
2475                                         OSRF_LOG_MARK,
2476                                         "%s: JOIN failed.  Invalid conditional expression.",
2477                                         MODULENAME
2478                                 );
2479                                 jsonIteratorFree( search_itr );
2480                                 buffer_free( join_buf );
2481                                 if( freeable_hash )
2482                                         jsonObjectFree( freeable_hash );
2483                                 return NULL;
2484                         }
2485                 }
2486
2487                 buffer_add(join_buf, " ) ");
2488
2489                 // Recursively add a nested join, if one is present
2490                 const jsonObject* join_filter = jsonObjectGetKeyConst( snode, "join" );
2491                 if (join_filter) {
2492                         char* jpred = searchJOIN( join_filter, right_info );
2493                         if( jpred ) {
2494                                 OSRF_BUFFER_ADD_CHAR( join_buf, ' ' );
2495                                 OSRF_BUFFER_ADD( join_buf, jpred );
2496                                 free(jpred);
2497                         } else {
2498                                 osrfLogError(  OSRF_LOG_MARK, "%s: Invalid nested join.", MODULENAME );
2499                                 jsonIteratorFree( search_itr );
2500                                 buffer_free( join_buf );
2501                                 if( freeable_hash )
2502                                         jsonObjectFree( freeable_hash );
2503                                 return NULL;
2504                         }
2505                 }
2506         }
2507
2508         if(freeable_hash)
2509                 jsonObjectFree(freeable_hash);
2510         jsonIteratorFree(search_itr);
2511
2512         return buffer_release(join_buf);
2513 }
2514
2515 /*
2516
2517 { +class : { -or|-and : { field : { op : value }, ... } ... }, ... }
2518 { +class : { -or|-and : [ { field : { op : value }, ... }, ...] ... }, ... }
2519 [ { +class : { -or|-and : [ { field : { op : value }, ... }, ...] ... }, ... }, ... ]
2520
2521 Generate code to express a set of conditions, as for a WHERE clause.  Parameters:
2522
2523 search_hash is the JSON expression of the conditions.
2524 meta is the class definition from the IDL, for the relevant table.
2525 opjoin_type indicates whether multiple conditions, if present, should be
2526         connected by AND or OR.
2527 osrfMethodContext is loaded with all sorts of stuff, but all we do with it here is
2528         to pass it to other functions -- and all they do with it is to use the session
2529         and request members to send error messages back to the client.
2530
2531 */
2532
2533 static char* searchWHERE ( const jsonObject* search_hash, const ClassInfo* class_info,
2534                 int opjoin_type, osrfMethodContext* ctx ) {
2535
2536         osrfLogDebug(
2537                 OSRF_LOG_MARK,
2538                 "%s: Entering searchWHERE; search_hash addr = %p, meta addr = %p, opjoin_type = %d, ctx addr = %p",
2539                 MODULENAME,
2540                 search_hash,
2541                 class_info->class_def,
2542                 opjoin_type,
2543                 ctx
2544         );
2545
2546         growing_buffer* sql_buf = buffer_init(128);
2547
2548         jsonObject* node = NULL;
2549
2550         int first = 1;
2551         if ( search_hash->type == JSON_ARRAY ) {
2552                 osrfLogDebug(OSRF_LOG_MARK, "%s: In WHERE clause, condition type is JSON_ARRAY", MODULENAME);
2553                 if( 0 == search_hash->size ) {
2554                         osrfLogError(
2555                                 OSRF_LOG_MARK,
2556                                 "%s: Invalid predicate structure: empty JSON array",
2557                                 MODULENAME
2558                         );
2559                         buffer_free( sql_buf );
2560                         return NULL;
2561                 }
2562
2563                 unsigned long i = 0;
2564                 while((node = jsonObjectGetIndex( search_hash, i++ ) )) {
2565                         if (first) {
2566                                 first = 0;
2567                         } else {
2568                                 if (opjoin_type == OR_OP_JOIN)
2569                                         buffer_add(sql_buf, " OR ");
2570                                 else
2571                                         buffer_add(sql_buf, " AND ");
2572                         }
2573
2574                         char* subpred = searchWHERE( node, class_info, opjoin_type, ctx );
2575                         if( ! subpred ) {
2576                                 buffer_free( sql_buf );
2577                                 return NULL;
2578                         }
2579
2580                         buffer_fadd(sql_buf, "( %s )", subpred);
2581                         free(subpred);
2582                 }
2583
2584         } else if ( search_hash->type == JSON_HASH ) {
2585                 osrfLogDebug(OSRF_LOG_MARK, "%s: In WHERE clause, condition type is JSON_HASH", MODULENAME);
2586                 jsonIterator* search_itr = jsonNewIterator( search_hash );
2587                 if( !jsonIteratorHasNext( search_itr ) ) {
2588                         osrfLogError(
2589                                 OSRF_LOG_MARK,
2590                                 "%s: Invalid predicate structure: empty JSON object",
2591                                 MODULENAME
2592                         );
2593                         jsonIteratorFree( search_itr );
2594                         buffer_free( sql_buf );
2595                         return NULL;
2596                 }
2597
2598                 while ( (node = jsonIteratorNext( search_itr )) ) {
2599
2600                         if (first) {
2601                                 first = 0;
2602                         } else {
2603                                 if (opjoin_type == OR_OP_JOIN)
2604                                         buffer_add(sql_buf, " OR ");
2605                                 else
2606                                         buffer_add(sql_buf, " AND ");
2607                         }
2608
2609                         if ( '+' == search_itr->key[ 0 ] ) {
2610
2611                                 // This plus sign prefixes a class name or other table alias;
2612                                 // make sure the table alias is in scope
2613                                 ClassInfo* alias_info = search_all_alias( search_itr->key + 1 );
2614                                 if( ! alias_info ) {
2615                                         osrfLogError(
2616                                                          OSRF_LOG_MARK,
2617                                                         "%s: Invalid table alias \"%s\" in WHERE clause",
2618                                                         MODULENAME,
2619                                                         search_itr->key + 1
2620                                         );
2621                                         jsonIteratorFree( search_itr );
2622                                         buffer_free( sql_buf );
2623                                         return NULL;
2624                                 }
2625
2626                                 if ( node->type == JSON_STRING ) {
2627                                         // It's the name of a column; make sure it belongs to the class
2628                                         const char* fieldname = jsonObjectGetString( node );
2629                                         if( ! osrfHashGet( alias_info->fields, fieldname ) ) {
2630                                                 osrfLogError(
2631                                                         OSRF_LOG_MARK,
2632                                                         "%s: Invalid column name \"%s\" in WHERE clause for table alias \"%s\"",
2633                                                         MODULENAME,
2634                                                         fieldname,
2635                                                         alias_info->alias
2636                                                 );
2637                                                 jsonIteratorFree( search_itr );
2638                                                 buffer_free( sql_buf );
2639                                                 return NULL;
2640                                         }
2641
2642                                         buffer_fadd(sql_buf, " \"%s\".%s ", alias_info->alias, fieldname );
2643                                 } else {
2644                                         // It's something more complicated
2645                                         char* subpred = searchWHERE( node, alias_info, AND_OP_JOIN, ctx );
2646                                         if( ! subpred ) {
2647                                                 jsonIteratorFree( search_itr );
2648                                                 buffer_free( sql_buf );
2649                                                 return NULL;
2650                                         }
2651
2652                                         buffer_fadd(sql_buf, "( %s )", subpred);
2653                                         free(subpred);
2654                                 }
2655                         } else if ( '-' == search_itr->key[ 0 ] ) {
2656                                 if ( !strcasecmp("-or",search_itr->key) ) {
2657                                         char* subpred = searchWHERE( node, class_info, OR_OP_JOIN, ctx );
2658                                         if( ! subpred ) {
2659                                                 jsonIteratorFree( search_itr );
2660                                                 buffer_free( sql_buf );
2661                                                 return NULL;
2662                                         }
2663
2664                                         buffer_fadd(sql_buf, "( %s )", subpred);
2665                                         free( subpred );
2666                                 } else if ( !strcasecmp("-and",search_itr->key) ) {
2667                                         char* subpred = searchWHERE( node, class_info, AND_OP_JOIN, ctx );
2668                                         if( ! subpred ) {
2669                                                 jsonIteratorFree( search_itr );
2670                                                 buffer_free( sql_buf );
2671                                                 return NULL;
2672                                         }
2673
2674                                         buffer_fadd(sql_buf, "( %s )", subpred);
2675                                         free( subpred );
2676                                 } else if ( !strcasecmp("-not",search_itr->key) ) {
2677                                         char* subpred = searchWHERE( node, class_info, AND_OP_JOIN, ctx );
2678                                         if( ! subpred ) {
2679                                                 jsonIteratorFree( search_itr );
2680                                                 buffer_free( sql_buf );
2681                                                 return NULL;
2682                                         }
2683
2684                                         buffer_fadd(sql_buf, " NOT ( %s )", subpred);
2685                                         free( subpred );
2686                                 } else if ( !strcasecmp("-exists",search_itr->key) ) {
2687                                         char* subpred = SELECT(
2688                                                 ctx,
2689                                                 jsonObjectGetKey( node, "select" ),
2690                                                 jsonObjectGetKey( node, "from" ),
2691                                                 jsonObjectGetKey( node, "where" ),
2692                                                 jsonObjectGetKey( node, "having" ),
2693                                                 jsonObjectGetKey( node, "order_by" ),
2694                                                 jsonObjectGetKey( node, "limit" ),
2695                                                 jsonObjectGetKey( node, "offset" ),
2696                                                 SUBSELECT
2697                                         );
2698                                         pop_query_frame();
2699
2700                                         if( ! subpred ) {
2701                                                 jsonIteratorFree( search_itr );
2702                                                 buffer_free( sql_buf );
2703                                                 return NULL;
2704                                         }
2705
2706                                         buffer_fadd(sql_buf, "EXISTS ( %s )", subpred);
2707                                         free(subpred);
2708                                 } else if ( !strcasecmp("-not-exists",search_itr->key) ) {
2709                                         char* subpred = SELECT(
2710                                                 ctx,
2711                                                 jsonObjectGetKey( node, "select" ),
2712                                                 jsonObjectGetKey( node, "from" ),
2713                                                 jsonObjectGetKey( node, "where" ),
2714                                                 jsonObjectGetKey( node, "having" ),
2715                                                 jsonObjectGetKey( node, "order_by" ),
2716                                                 jsonObjectGetKey( node, "limit" ),
2717                                                 jsonObjectGetKey( node, "offset" ),
2718                                                 SUBSELECT
2719                                         );
2720                                         pop_query_frame();
2721
2722                                         if( ! subpred ) {
2723                                                 jsonIteratorFree( search_itr );
2724                                                 buffer_free( sql_buf );
2725                                                 return NULL;
2726                                         }
2727
2728                                         buffer_fadd(sql_buf, "NOT EXISTS ( %s )", subpred);
2729                                         free(subpred);
2730                                 } else {     // Invalid "minus" operator
2731                                         osrfLogError(
2732                                                          OSRF_LOG_MARK,
2733                                                         "%s: Invalid operator \"%s\" in WHERE clause",
2734                                                         MODULENAME,
2735                                                         search_itr->key
2736                                         );
2737                                         jsonIteratorFree( search_itr );
2738                                         buffer_free( sql_buf );
2739                                         return NULL;
2740                                 }
2741
2742                         } else {
2743
2744                                 const char* class = class_info->class_name;
2745                                 osrfHash* fields = class_info->fields;
2746                                 osrfHash* field = osrfHashGet( fields, search_itr->key );
2747
2748                                 if (!field) {
2749                                         const char* table = class_info->source_def;
2750                                         osrfLogError(
2751                                                 OSRF_LOG_MARK,
2752                                                 "%s: Attempt to reference non-existent column \"%s\" on %s (%s)",
2753                                                 MODULENAME,
2754                                                 search_itr->key,
2755                                                 table ? table : "?",
2756                                                 class ? class : "?"
2757                                         );
2758                                         jsonIteratorFree(search_itr);
2759                                         buffer_free(sql_buf);
2760                                         return NULL;
2761                                 }
2762
2763                                 char* subpred = searchPredicate( class_info, field, node, ctx );
2764                                 if( ! subpred ) {
2765                                         buffer_free(sql_buf);
2766                                         jsonIteratorFree(search_itr);
2767                                         return NULL;
2768                                 }
2769
2770                                 buffer_add( sql_buf, subpred );
2771                                 free(subpred);
2772                         }
2773                 }
2774                 jsonIteratorFree(search_itr);
2775
2776     } else {
2777         // ERROR ... only hash and array allowed at this level
2778         char* predicate_string = jsonObjectToJSON( search_hash );
2779         osrfLogError(
2780             OSRF_LOG_MARK,
2781             "%s: Invalid predicate structure: %s",
2782             MODULENAME,
2783             predicate_string
2784         );
2785         buffer_free(sql_buf);
2786         free(predicate_string);
2787         return NULL;
2788     }
2789
2790         return buffer_release(sql_buf);
2791 }
2792
2793 char* SELECT (
2794                 /* method context */ osrfMethodContext* ctx,
2795
2796                 /* SELECT   */ jsonObject* selhash,
2797                 /* FROM     */ jsonObject* join_hash,
2798                 /* WHERE    */ jsonObject* search_hash,
2799                 /* HAVING   */ jsonObject* having_hash,
2800                 /* ORDER BY */ jsonObject* order_hash,
2801                 /* LIMIT    */ jsonObject* limit,
2802                 /* OFFSET   */ jsonObject* offset,
2803                 /* flags    */ int flags
2804 ) {
2805         const char* locale = osrf_message_get_last_locale();
2806
2807         // general tmp objects
2808         const jsonObject* tmp_const;
2809         jsonObject* selclass = NULL;
2810         jsonObject* selfield = NULL;
2811         jsonObject* snode = NULL;
2812         jsonObject* onode = NULL;
2813
2814         char* string = NULL;
2815         int from_function = 0;
2816         int first = 1;
2817         int gfirst = 1;
2818         //int hfirst = 1;
2819
2820         osrfLogDebug(OSRF_LOG_MARK, "cstore SELECT locale: %s", locale);
2821
2822         // punt if there's no FROM clause
2823         if (!join_hash || ( join_hash->type == JSON_HASH && !join_hash->size )) {
2824                 osrfLogError(
2825                         OSRF_LOG_MARK,
2826                         "%s: FROM clause is missing or empty",
2827                         MODULENAME
2828                 );
2829                 if( ctx )
2830                         osrfAppSessionStatus(
2831                                 ctx->session,
2832                                 OSRF_STATUS_INTERNALSERVERERROR,
2833                                 "osrfMethodException",
2834                                 ctx->request,
2835                                 "FROM clause is missing or empty in JSON query"
2836                         );
2837                 return NULL;
2838         }
2839
2840         // Push a node onto the stack for the current query.  Every level of
2841         // subquery gets its own QueryFrame on the Stack.
2842         push_query_frame();
2843
2844         // the core search class
2845         const char* core_class = NULL;
2846
2847         // get the core class -- the only key of the top level FROM clause, or a string
2848         if (join_hash->type == JSON_HASH) {
2849                 jsonIterator* tmp_itr = jsonNewIterator( join_hash );
2850                 snode = jsonIteratorNext( tmp_itr );
2851
2852                 // Populate the current QueryFrame with information
2853                 // about the core class
2854                 if( add_query_core( NULL, tmp_itr->key ) ) {
2855                         if( ctx )
2856                                 osrfAppSessionStatus(
2857                                         ctx->session,
2858                                         OSRF_STATUS_INTERNALSERVERERROR,
2859                                         "osrfMethodException",
2860                                         ctx->request,
2861                                         "Unable to look up core class"
2862                                 );
2863                         return NULL;
2864                 }
2865                 core_class = curr_query->core.class_name;
2866                 join_hash = snode;
2867
2868                 jsonObject* extra = jsonIteratorNext( tmp_itr );
2869
2870                 jsonIteratorFree( tmp_itr );
2871                 snode = NULL;
2872
2873                 // There shouldn't be more than one entry in join_hash
2874                 if( extra ) {
2875                         osrfLogError(
2876                                 OSRF_LOG_MARK,
2877                                 "%s: Malformed FROM clause: extra entry in JSON_HASH",
2878                                 MODULENAME
2879                         );
2880                         if( ctx )
2881                                 osrfAppSessionStatus(
2882                                         ctx->session,
2883                                         OSRF_STATUS_INTERNALSERVERERROR,
2884                                         "osrfMethodException",
2885                                         ctx->request,
2886                                         "Malformed FROM clause in JSON query"
2887                                 );
2888                         return NULL;    // Malformed join_hash; extra entry
2889                 }
2890         } else if (join_hash->type == JSON_ARRAY) {
2891                 // We're selecting from a function, not from a table
2892                 from_function = 1;
2893                 core_class = jsonObjectGetString( jsonObjectGetIndex(join_hash, 0) );
2894                 selhash = NULL;
2895
2896         } else if (join_hash->type == JSON_STRING) {
2897                 // Populate the current QueryFrame with information
2898                 // about the core class
2899                 core_class = jsonObjectGetString( join_hash );
2900                 join_hash = NULL;
2901                 if( add_query_core( NULL, core_class ) ) {
2902                         if( ctx )
2903                                 osrfAppSessionStatus(
2904                                         ctx->session,
2905                                         OSRF_STATUS_INTERNALSERVERERROR,
2906                                         "osrfMethodException",
2907                                         ctx->request,
2908                                         "Unable to look up core class"
2909                                 );
2910                         return NULL;
2911                 }
2912         }
2913         else {
2914                 osrfLogError(
2915                         OSRF_LOG_MARK,
2916                         "%s: FROM clause is unexpected JSON type: %s",
2917                         MODULENAME,
2918                         json_type( join_hash->type )
2919                 );
2920                 if( ctx )
2921                         osrfAppSessionStatus(
2922                                 ctx->session,
2923                                 OSRF_STATUS_INTERNALSERVERERROR,
2924                                 "osrfMethodException",
2925                                 ctx->request,
2926                                 "Ill-formed FROM clause in JSON query"
2927                         );
2928                 return NULL;
2929         }
2930
2931         // Build the join clause, if any, while filling out the list
2932         // of joined classes in the current QueryFrame.
2933         char* join_clause = NULL;
2934         if( join_hash && ! from_function ) {
2935
2936                 join_clause = searchJOIN( join_hash, &curr_query->core );
2937                 if( ! join_clause ) {
2938                         if (ctx)
2939                                 osrfAppSessionStatus(
2940                                         ctx->session,
2941                                         OSRF_STATUS_INTERNALSERVERERROR,
2942                                         "osrfMethodException",
2943                                         ctx->request,
2944                                         "Unable to construct JOIN clause(s)"
2945                                 );
2946                         return NULL;
2947                 }
2948         }
2949
2950         // For in case we don't get a select list
2951         jsonObject* defaultselhash = NULL;
2952
2953         // if the select list is empty, or the core class field list is '*',
2954         // build the default select list ...
2955         if (!selhash) {
2956                 selhash = defaultselhash = jsonNewObjectType(JSON_HASH);
2957                 jsonObjectSetKey( selhash, core_class, jsonNewObjectType(JSON_ARRAY) );
2958         } else if( selhash->type != JSON_HASH ) {
2959                 osrfLogError(
2960                         OSRF_LOG_MARK,
2961                         "%s: Expected JSON_HASH for SELECT clause; found %s",
2962                         MODULENAME,
2963                         json_type( selhash->type )
2964                 );
2965
2966                 if (ctx)
2967                         osrfAppSessionStatus(
2968                                 ctx->session,
2969                                 OSRF_STATUS_INTERNALSERVERERROR,
2970                                 "osrfMethodException",
2971                                 ctx->request,
2972                                 "Malformed SELECT clause in JSON query"
2973                         );
2974                 free( join_clause );
2975                 return NULL;
2976         } else if ( (tmp_const = jsonObjectGetKeyConst( selhash, core_class )) && tmp_const->type == JSON_STRING ) {
2977                 const char* _x = jsonObjectGetString( tmp_const );
2978                 if (!strncmp( "*", _x, 1 )) {
2979                         jsonObjectRemoveKey( selhash, core_class );
2980                         jsonObjectSetKey( selhash, core_class, jsonNewObjectType(JSON_ARRAY) );
2981                 }
2982         }
2983
2984         // temp buffers for the SELECT list and GROUP BY clause
2985         growing_buffer* select_buf = buffer_init(128);
2986         growing_buffer* group_buf = buffer_init(128);
2987
2988         int aggregate_found = 0;     // boolean
2989
2990         // Build a select list
2991         if(from_function)   // From a function we select everything
2992                 OSRF_BUFFER_ADD_CHAR( select_buf, '*' );
2993         else {
2994
2995                 // If we need to build a default list, prepare to do so
2996                 jsonObject* _tmp = jsonObjectGetKey( selhash, core_class );
2997                 if ( _tmp && !_tmp->size ) {
2998
2999                         osrfHash* core_fields = curr_query->core.fields;
3000
3001                         osrfHashIterator* field_itr = osrfNewHashIterator( core_fields );
3002                         osrfHash* field_def;
3003                         while( ( field_def = osrfHashIteratorNext( field_itr ) ) ) {
3004                                 if( ! str_is_true( osrfHashGet( field_def, "virtual" ) ) ) {
3005                                         // This field is not virtual, so add it to the list
3006                                         jsonObjectPush( _tmp, jsonNewObject( osrfHashIteratorKey( field_itr ) ) );
3007                                 }
3008                         }
3009                         osrfHashIteratorFree( field_itr );
3010                 }
3011
3012                 // Now build the actual select list
3013             int sel_pos = 1;
3014             first = 1;
3015             gfirst = 1;
3016             jsonIterator* selclass_itr = jsonNewIterator( selhash );
3017             while ( (selclass = jsonIteratorNext( selclass_itr )) ) {    // For each class
3018
3019                         const char* cname = selclass_itr->key;
3020
3021                         // Make sure the target relation is in the FROM clause.
3022
3023                         // At this point join_hash is a step down from the join_hash we
3024                         // received as a parameter.  If the original was a JSON_STRING,
3025                         // then json_hash is now NULL.  If the original was a JSON_HASH,
3026                         // then json_hash is now the first (and only) entry in it,
3027                         // denoting the core class.  We've already excluded the
3028                         // possibility that the original was a JSON_ARRAY, because in
3029                         // that case from_function would be non-NULL, and we wouldn't
3030                         // be here.
3031
3032                         // If the current class isn't the core class
3033                         // and it isn't in the join tree, bail out
3034                         ClassInfo* class_info = search_alias( cname );
3035                         if( ! class_info ) {
3036                                 osrfLogError(
3037                                         OSRF_LOG_MARK,
3038                                         "%s: SELECT clause references class not in FROM clause: \"%s\"",
3039                                         MODULENAME,
3040                                         cname
3041                                 );
3042                                 if( ctx )
3043                                         osrfAppSessionStatus(
3044                                                 ctx->session,
3045                                                 OSRF_STATUS_INTERNALSERVERERROR,
3046                                                 "osrfMethodException",
3047                                                 ctx->request,
3048                                                 "Selected class not in FROM clause in JSON query"
3049                                         );
3050                                 jsonIteratorFree( selclass_itr );
3051                                 buffer_free( select_buf );
3052                                 buffer_free( group_buf );
3053                                 if( defaultselhash ) jsonObjectFree( defaultselhash );
3054                                 free( join_clause );
3055                                 return NULL;
3056                         }
3057
3058                         // Look up some attributes of the current class
3059                         osrfHash* idlClass = class_info->class_def;
3060                         osrfHash* class_field_set = class_info->fields;
3061                         const char* class_pkey = osrfHashGet( idlClass, "primarykey" );
3062                         const char* class_tname = osrfHashGet( idlClass, "tablename" );
3063
3064                         if( 0 == selclass->size ) {
3065                                 osrfLogWarning(
3066                                         OSRF_LOG_MARK,
3067                                         "%s: No columns selected from \"%s\"",
3068                                         MODULENAME,
3069                                         cname
3070                                 );
3071                         }
3072
3073                         // stitch together the column list for the current table alias...
3074                         jsonIterator* select_itr = jsonNewIterator( selclass );
3075                         while ( (selfield = jsonIteratorNext( select_itr )) ) {   // for each SELECT column
3076
3077                                 // If we need a separator comma, add one
3078                                 if (first) {
3079                                         first = 0;
3080                                 } else {
3081                                         OSRF_BUFFER_ADD_CHAR( select_buf, ',' );
3082                                 }
3083
3084                                 // ... if it's a string, just toss it on the pile
3085                                 if (selfield->type == JSON_STRING) {
3086
3087                                         // Look up the field in the IDL
3088                                         const char* col_name = jsonObjectGetString( selfield );
3089                                         osrfHash* field_def = osrfHashGet( class_field_set, col_name );
3090                                         if ( !field_def ) {
3091                                                 // No such field in current class
3092                                                 osrfLogError(
3093                                                         OSRF_LOG_MARK,
3094                                                         "%s: Selected column \"%s\" not defined in IDL for class \"%s\"",
3095                                                         MODULENAME,
3096                                                         col_name,
3097                                                         cname
3098                                                 );
3099                                                 if( ctx )
3100                                                         osrfAppSessionStatus(
3101                                                                 ctx->session,
3102                                                                 OSRF_STATUS_INTERNALSERVERERROR,
3103                                                                 "osrfMethodException",
3104                                                                 ctx->request,
3105                                                                 "Selected column not defined in JSON query"
3106                                                         );
3107                                                 jsonIteratorFree( select_itr );
3108                                                 jsonIteratorFree( selclass_itr );
3109                                                 buffer_free( select_buf );
3110                                                 buffer_free( group_buf );
3111                                                 if( defaultselhash ) jsonObjectFree( defaultselhash );
3112                                                 free( join_clause );
3113                                                 return NULL;
3114                                         } else if ( str_is_true( osrfHashGet( field_def, "virtual" ) ) ) {
3115                                                 // Virtual field not allowed
3116                                                 osrfLogError(
3117                                                         OSRF_LOG_MARK,
3118                                                         "%s: Selected column \"%s\" for class \"%s\" is virtual",
3119                                                         MODULENAME,
3120                                                         col_name,
3121                                                         cname
3122                                                 );
3123                                                 if( ctx )
3124                                                         osrfAppSessionStatus(
3125                                                                 ctx->session,
3126                                                                 OSRF_STATUS_INTERNALSERVERERROR,
3127                                                                 "osrfMethodException",
3128                                                                 ctx->request,
3129                                                                 "Selected column may not be virtual in JSON query"
3130                                                         );
3131                                                 jsonIteratorFree( select_itr );
3132                                                 jsonIteratorFree( selclass_itr );
3133                                                 buffer_free( select_buf );
3134                                                 buffer_free( group_buf );
3135                                                 if( defaultselhash ) jsonObjectFree( defaultselhash );
3136                                                 free( join_clause );
3137                                                 return NULL;
3138                                         }
3139
3140                                         if (locale) {
3141                                                 const char* i18n;
3142                                                 if (flags & DISABLE_I18N)
3143                                                         i18n = NULL;
3144                                                 else
3145                                                         i18n = osrfHashGet(field_def, "i18n");
3146
3147                                                 if( str_is_true( i18n ) ) {
3148                             buffer_fadd( select_buf,
3149                                                                 " oils_i18n_xlate('%s', '%s', '%s', '%s', \"%s\".%s::TEXT, '%s') AS \"%s\"",
3150                                                                 class_tname, cname, col_name, class_pkey, cname, class_pkey, locale, col_name );
3151                         } else {
3152                                             buffer_fadd(select_buf, " \"%s\".%s AS \"%s\"", cname, col_name, col_name );
3153                         }
3154                     } else {
3155                                         buffer_fadd(select_buf, " \"%s\".%s AS \"%s\"", cname, col_name, col_name );
3156                     }
3157
3158                                 // ... but it could be an object, in which case we check for a Field Transform
3159                                 } else if (selfield->type == JSON_HASH) {
3160
3161                                         const char* col_name = jsonObjectGetString( jsonObjectGetKeyConst( selfield, "column" ) );
3162
3163                                         // Get the field definition from the IDL
3164                                         osrfHash* field_def = osrfHashGet( class_field_set, col_name );
3165                                         if ( !field_def ) {
3166                                                 // No such field in current class
3167                                                 osrfLogError(
3168                                                         OSRF_LOG_MARK,
3169                                                         "%s: Selected column \"%s\" is not defined in IDL for class \"%s\"",
3170                                                         MODULENAME,
3171                                                         col_name,
3172                                                         cname
3173                                                 );
3174                                                 if( ctx )
3175                                                         osrfAppSessionStatus(
3176                                                                 ctx->session,
3177                                                                 OSRF_STATUS_INTERNALSERVERERROR,
3178                                                                 "osrfMethodException",
3179                                                                 ctx->request,
3180                                                                 "Selected column is not defined in JSON query"
3181                                                         );
3182                                                 jsonIteratorFree( select_itr );
3183                                                 jsonIteratorFree( selclass_itr );
3184                                                 buffer_free( select_buf );
3185                                                 buffer_free( group_buf );
3186                                                 if( defaultselhash ) jsonObjectFree( defaultselhash );
3187                                                 free( join_clause );
3188                                                 return NULL;
3189                                         } else if ( str_is_true( osrfHashGet( field_def, "virtual" ) ) ) {
3190                                                 // No such field in current class
3191                                                 osrfLogError(
3192                                                         OSRF_LOG_MARK,
3193                                                         "%s: Selected column \"%s\" is virtual for class \"%s\"",
3194                                                         MODULENAME,
3195                                                         col_name,
3196                                                         cname
3197                                                 );
3198                                                 if( ctx )
3199                                                         osrfAppSessionStatus(
3200                                                                 ctx->session,
3201                                                                 OSRF_STATUS_INTERNALSERVERERROR,
3202                                                                 "osrfMethodException",
3203                                                                 ctx->request,
3204                                                                 "Selected column is virtual in JSON query"
3205                                                         );
3206                                                 jsonIteratorFree( select_itr );
3207                                                 jsonIteratorFree( selclass_itr );
3208                                                 buffer_free( select_buf );
3209                                                 buffer_free( group_buf );
3210                                                 if( defaultselhash ) jsonObjectFree( defaultselhash );
3211                                                 free( join_clause );
3212                                                 return NULL;
3213                                         }
3214
3215                                         // Decide what to use as a column alias
3216                                         const char* _alias;
3217                                         if ((tmp_const = jsonObjectGetKeyConst( selfield, "alias" ))) {
3218                                                 _alias = jsonObjectGetString( tmp_const );
3219                                         } else {         // Use field name as the alias
3220                                                 _alias = col_name;
3221                                         }
3222
3223                                         if (jsonObjectGetKeyConst( selfield, "transform" )) {
3224                                                 char* transform_str = searchFieldTransform(class_info->alias, field_def, selfield);
3225                                                 if( transform_str ) {
3226                                                         buffer_fadd(select_buf, " %s AS \"%s\"", transform_str, _alias);
3227                                                         free(transform_str);
3228                                                 } else {
3229                                                         if( ctx )
3230                                                                 osrfAppSessionStatus(
3231                                                                         ctx->session,
3232                                                                         OSRF_STATUS_INTERNALSERVERERROR,
3233                                                                         "osrfMethodException",
3234                                                                         ctx->request,
3235                                                                         "Unable to generate transform function in JSON query"
3236                                                                 );
3237                                                         jsonIteratorFree( select_itr );
3238                                                         jsonIteratorFree( selclass_itr );
3239                                                         buffer_free( select_buf );
3240                                                         buffer_free( group_buf );
3241                                                         if( defaultselhash ) jsonObjectFree( defaultselhash );
3242                                                         free( join_clause );
3243                                                         return NULL;
3244                                                 }
3245                                         } else {
3246
3247                                                 if (locale) {
3248                                                         const char* i18n;
3249                                                         if (flags & DISABLE_I18N)
3250                                                                 i18n = NULL;
3251                                                         else
3252                                                                 i18n = osrfHashGet(field_def, "i18n");
3253
3254                                                         if( str_is_true( i18n ) ) {
3255                                                                 buffer_fadd( select_buf,
3256                                                                         " oils_i18n_xlate('%s', '%s', '%s', '%s', \"%s\".%s::TEXT, '%s') AS \"%s\"",
3257                                                                         class_tname, cname, col_name, class_pkey, cname, class_pkey, locale, _alias);
3258                                                         } else {
3259                                                                 buffer_fadd(select_buf, " \"%s\".%s AS \"%s\"", cname, col_name, _alias);
3260                                                         }
3261                                                 } else {
3262                                                         buffer_fadd(select_buf, " \"%s\".%s AS \"%s\"", cname, col_name, _alias);
3263                                                 }
3264                                         }
3265                                 }
3266                                 else {
3267                                         osrfLogError(
3268                                                 OSRF_LOG_MARK,
3269                                                 "%s: Selected item is unexpected JSON type: %s",
3270                                                 MODULENAME,
3271                                                 json_type( selfield->type )
3272                                         );
3273                                         if( ctx )
3274                                                 osrfAppSessionStatus(
3275                                                         ctx->session,
3276                                                         OSRF_STATUS_INTERNALSERVERERROR,
3277                                                         "osrfMethodException",
3278                                                         ctx->request,
3279                                                         "Ill-formed SELECT item in JSON query"
3280                                                 );
3281                                         jsonIteratorFree( select_itr );
3282                                         jsonIteratorFree( selclass_itr );
3283                                         buffer_free( select_buf );
3284                                         buffer_free( group_buf );
3285                                         if( defaultselhash ) jsonObjectFree( defaultselhash );
3286                                         free( join_clause );
3287                                         return NULL;
3288                                 }
3289
3290                                 const jsonObject* agg_obj = jsonObjectGetKey( selfield, "aggregate" );
3291                                 if( obj_is_true( agg_obj ) )
3292                                         aggregate_found = 1;
3293                                 else {
3294                                         // Append a comma (except for the first one)
3295                                         // and add the column to a GROUP BY clause
3296                                         if (gfirst)
3297                                                 gfirst = 0;
3298                                         else
3299                                                 OSRF_BUFFER_ADD_CHAR( group_buf, ',' );
3300
3301                                         buffer_fadd(group_buf, " %d", sel_pos);
3302                                 }
3303
3304 #if 0
3305                             if (is_agg->size || (flags & SELECT_DISTINCT)) {
3306
3307                                         const jsonObject* aggregate_obj = jsonObjectGetKey( selfield, "aggregate" );
3308                                     if ( ! obj_is_true( aggregate_obj ) ) {
3309                                             if (gfirst) {
3310                                                     gfirst = 0;
3311                                             } else {
3312                                                         OSRF_BUFFER_ADD_CHAR( group_buf, ',' );
3313                                             }
3314
3315                                             buffer_fadd(group_buf, " %d", sel_pos);
3316
3317                                         /*
3318                                     } else if (is_agg = jsonObjectGetKey( selfield, "having" )) {
3319                                             if (gfirst) {
3320                                                     gfirst = 0;
3321                                             } else {
3322                                                         OSRF_BUFFER_ADD_CHAR( group_buf, ',' );
3323                                             }
3324
3325                                             _column = searchFieldTransform(class_info->alias, field, selfield);
3326                                                 OSRF_BUFFER_ADD_CHAR(group_buf, ' ');
3327                                                 OSRF_BUFFER_ADD(group_buf, _column);
3328                                             _column = searchFieldTransform(class_info->alias, field, selfield);
3329                                         */
3330                                     }
3331                             }
3332 #endif
3333
3334                                 sel_pos++;
3335                         } // end while -- iterating across SELECT columns
3336
3337                         jsonIteratorFree(select_itr);
3338                 } // end while -- iterating across classes
3339
3340                 jsonIteratorFree(selclass_itr);
3341         }
3342
3343
3344         char* col_list = buffer_release(select_buf);
3345
3346         // Make sure the SELECT list isn't empty.  This can happen if we try to
3347         // build a default SELECT clause from a non-core table.
3348
3349         if( ! *col_list ) {
3350                 if (ctx)
3351                         osrfAppSessionStatus(
3352                                 ctx->session,
3353                                 OSRF_STATUS_INTERNALSERVERERROR,
3354                                 "osrfMethodException",
3355                                 ctx->request,
3356                                 "SELECT list is empty"
3357                 );
3358                 free( col_list );
3359                 buffer_free( group_buf );
3360                 if( defaultselhash ) jsonObjectFree( defaultselhash );
3361                 free( join_clause );
3362                 return NULL;
3363         }
3364
3365         char* table = NULL;
3366         if (from_function) table = searchValueTransform(join_hash);
3367         else table = strdup( curr_query->core.source_def );
3368
3369         if( !table ) {
3370                 if (ctx)
3371                         osrfAppSessionStatus(
3372                                 ctx->session,
3373                                 OSRF_STATUS_INTERNALSERVERERROR,
3374                                 "osrfMethodException",
3375                                 ctx->request,
3376                                 "Unable to identify table for core class"
3377                         );
3378                 free( col_list );
3379                 buffer_free( group_buf );
3380                 if( defaultselhash ) jsonObjectFree( defaultselhash );
3381                 free( join_clause );
3382                 return NULL;
3383         }
3384
3385         // Put it all together
3386         growing_buffer* sql_buf = buffer_init(128);
3387         buffer_fadd(sql_buf, "SELECT %s FROM %s AS \"%s\" ", col_list, table, core_class );
3388         free(col_list);
3389         free(table);
3390
3391         // Append the join clause, if any
3392         if( join_clause ) {
3393                 buffer_add(sql_buf, join_clause);
3394                 free(join_clause);
3395         }
3396
3397         char* order_by_list = NULL;
3398         char* having_buf = NULL;
3399
3400         if (!from_function) {
3401
3402                 // Build a WHERE clause, if there is one
3403                 if ( search_hash ) {
3404                         buffer_add(sql_buf, " WHERE ");
3405
3406                         // and it's on the WHERE clause
3407                         char* pred = searchWHERE( search_hash, &curr_query->core, AND_OP_JOIN, ctx );
3408                         if ( ! pred ) {
3409                                 if (ctx) {
3410                                         osrfAppSessionStatus(
3411                                                 ctx->session,
3412                                                 OSRF_STATUS_INTERNALSERVERERROR,
3413                                                 "osrfMethodException",
3414                                                 ctx->request,
3415                                                 "Severe query error in WHERE predicate -- see error log for more details"
3416                                         );
3417                                 }
3418                                 buffer_free(group_buf);
3419                                 buffer_free(sql_buf);
3420                                 if (defaultselhash) jsonObjectFree(defaultselhash);
3421                                 return NULL;
3422                         }
3423
3424                         buffer_add(sql_buf, pred);
3425                         free(pred);
3426                 }
3427
3428                 // Build a HAVING clause, if there is one
3429                 if ( having_hash ) {
3430
3431                         // and it's on the the WHERE clause
3432                         having_buf = searchWHERE( having_hash, &curr_query->core, AND_OP_JOIN, ctx );
3433
3434                         if( ! having_buf ) {
3435                                 if (ctx) {
3436                                                 osrfAppSessionStatus(
3437                                                 ctx->session,
3438                                                 OSRF_STATUS_INTERNALSERVERERROR,
3439                                                 "osrfMethodException",
3440                                                 ctx->request,
3441                                                 "Severe query error in HAVING predicate -- see error log for more details"
3442                                         );
3443                                 }
3444                                 buffer_free(group_buf);
3445                                 buffer_free(sql_buf);
3446                                 if (defaultselhash) jsonObjectFree(defaultselhash);
3447                                 return NULL;
3448                         }
3449                 }
3450
3451                 growing_buffer* order_buf = NULL;  // to collect ORDER BY list
3452
3453                 // Build an ORDER BY clause, if there is one
3454                 if( NULL == order_hash )
3455                         ;  // No ORDER BY? do nothing
3456                 else if( JSON_ARRAY == order_hash->type ) {
3457                         // Array of field specifications, each specification being a
3458                         // hash to define the class, field, and other details
3459                         int order_idx = 0;
3460                         jsonObject* order_spec;
3461                         while( (order_spec = jsonObjectGetIndex( order_hash, order_idx++ ) ) ) {
3462
3463                                 if( JSON_HASH != order_spec->type ) {
3464                                         osrfLogError(OSRF_LOG_MARK,
3465                                                  "%s: Malformed field specification in ORDER BY clause; expected JSON_HASH, found %s",
3466                                                 MODULENAME, json_type( order_spec->type ) );
3467                                         if( ctx )
3468                                                 osrfAppSessionStatus(
3469                                                          ctx->session,
3470                                                         OSRF_STATUS_INTERNALSERVERERROR,
3471                                                         "osrfMethodException",
3472                                                         ctx->request,
3473                                                         "Malformed ORDER BY clause -- see error log for more details"
3474                                                 );
3475                                         buffer_free( order_buf );
3476                                         free(having_buf);
3477                                         buffer_free(group_buf);
3478                                         buffer_free(sql_buf);
3479                                         if (defaultselhash) jsonObjectFree(defaultselhash);
3480                                         return NULL;
3481                                 }
3482
3483                                 const char* class_alias =
3484                                                 jsonObjectGetString( jsonObjectGetKeyConst( order_spec, "class" ) );
3485                                 const char* field =
3486                                                 jsonObjectGetString( jsonObjectGetKeyConst( order_spec, "field" ) );
3487
3488                                 if ( order_buf )
3489                                         OSRF_BUFFER_ADD(order_buf, ", ");
3490                                 else
3491                                         order_buf = buffer_init(128);
3492
3493                                 if( !field || !class_alias ) {
3494                                         osrfLogError(OSRF_LOG_MARK,
3495                                                 "%s: Missing class or field name in field specification of ORDER BY clause",
3496                                                  MODULENAME );
3497                                         if( ctx )
3498                                                 osrfAppSessionStatus(
3499                                                         ctx->session,
3500                                                         OSRF_STATUS_INTERNALSERVERERROR,
3501                                                         "osrfMethodException",
3502                                                         ctx->request,
3503                                                         "Malformed ORDER BY clause -- see error log for more details"
3504                                                 );
3505                                         buffer_free( order_buf );
3506                                         free(having_buf);
3507                                         buffer_free(group_buf);
3508                                         buffer_free(sql_buf);
3509                                         if (defaultselhash) jsonObjectFree(defaultselhash);
3510                                         return NULL;
3511                                 }
3512
3513                                 ClassInfo* order_class_info = search_alias( class_alias );
3514                                 if( ! order_class_info ) {
3515                                         osrfLogError(OSRF_LOG_MARK, "%s: ORDER BY clause references class \"%s\" "
3516                                                         "not in FROM clause", MODULENAME, class_alias );
3517                                         if( ctx )
3518                                                 osrfAppSessionStatus(
3519                                                         ctx->session,
3520                                                         OSRF_STATUS_INTERNALSERVERERROR,
3521                                                         "osrfMethodException",
3522                                                         ctx->request,
3523                                                         "Invalid class referenced in ORDER BY clause -- see error log for more details"
3524                                                 );
3525                                         free(having_buf);
3526                                         buffer_free(group_buf);
3527                                         buffer_free(sql_buf);
3528                                         if (defaultselhash) jsonObjectFree(defaultselhash);
3529                                         return NULL;
3530                                 }
3531
3532                                 osrfHash* field_def = osrfHashGet( order_class_info->fields, field );
3533                                 if( !field_def ) {
3534                                         osrfLogError(OSRF_LOG_MARK, "%s: Invalid field \"%s\".%s referenced in ORDER BY clause",
3535                                                  MODULENAME, class_alias, field );
3536                                         if( ctx )
3537                                                 osrfAppSessionStatus(
3538                                                         ctx->session,
3539                                                         OSRF_STATUS_INTERNALSERVERERROR,
3540                                                         "osrfMethodException",
3541                                                         ctx->request,
3542                                                         "Invalid field referenced in ORDER BY clause -- see error log for more details"
3543                                                 );
3544                                         free(having_buf);
3545                                         buffer_free(group_buf);
3546                                         buffer_free(sql_buf);
3547                                         if (defaultselhash) jsonObjectFree(defaultselhash);
3548                                         return NULL;
3549                                 } else if( str_is_true( osrfHashGet( field_def, "virtual" ) ) ) {
3550                                         osrfLogError(OSRF_LOG_MARK, "%s: Virtual field \"%s\" in ORDER BY clause",
3551                                                                  MODULENAME, field );
3552                                         if( ctx )
3553                                                 osrfAppSessionStatus(
3554                                                         ctx->session,
3555                                                         OSRF_STATUS_INTERNALSERVERERROR,
3556                                                         "osrfMethodException",
3557                                                         ctx->request,
3558                                                         "Virtual field in ORDER BY clause -- see error log for more details"
3559                                                 );
3560                                         buffer_free( order_buf );
3561                                         free(having_buf);
3562                                         buffer_free(group_buf);
3563                                         buffer_free(sql_buf);
3564                                         if (defaultselhash) jsonObjectFree(defaultselhash);
3565                                         return NULL;
3566                                 }
3567
3568                                 if( jsonObjectGetKeyConst( order_spec, "transform" ) ) {
3569                                         char* transform_str = searchFieldTransform( class_alias, field_def, order_spec );
3570                                         if( ! transform_str ) {
3571                                                 if( ctx )
3572                                                         osrfAppSessionStatus(
3573                                                                 ctx->session,
3574                                                                 OSRF_STATUS_INTERNALSERVERERROR,
3575                                                                 "osrfMethodException",
3576                                                                 ctx->request,
3577                                                                 "Severe query error in ORDER BY clause -- see error log for more details"
3578                                                         );
3579                                                 buffer_free( order_buf );
3580                                                 free(having_buf);
3581                                                 buffer_free(group_buf);
3582                                                 buffer_free(sql_buf);
3583                                                 if (defaultselhash) jsonObjectFree(defaultselhash);
3584                                                 return NULL;
3585                                         }
3586
3587                                         OSRF_BUFFER_ADD( order_buf, transform_str );
3588                                         free( transform_str );
3589                                 }
3590                                 else
3591                                         buffer_fadd( order_buf, "\"%s\".%s", class_alias, field );
3592
3593                                 const char* direction =
3594                                                 jsonObjectGetString( jsonObjectGetKeyConst( order_spec, "direction" ) );
3595                                 if( direction ) {
3596                                         if( direction[ 0 ] || 'D' == direction[ 0 ] )
3597                                                 OSRF_BUFFER_ADD( order_buf, " DESC" );
3598                                         else
3599                                                 OSRF_BUFFER_ADD( order_buf, " ASC" );
3600                                 }
3601                         }
3602                 } else if( JSON_HASH == order_hash->type ) {
3603                         // This hash is keyed on class alias.  Each class has either
3604                         // an array of field names or a hash keyed on field name.
3605                         jsonIterator* class_itr = jsonNewIterator( order_hash );
3606                         while ( (snode = jsonIteratorNext( class_itr )) ) {
3607
3608                                 ClassInfo* order_class_info = search_alias( class_itr->key );
3609                                 if( ! order_class_info ) {
3610                                         osrfLogError(OSRF_LOG_MARK, "%s: Invalid class \"%s\" referenced in ORDER BY clause",
3611                                                                  MODULENAME, class_itr->key );
3612                                         if( ctx )
3613                                                 osrfAppSessionStatus(
3614                                                         ctx->session,
3615                                                         OSRF_STATUS_INTERNALSERVERERROR,
3616                                                         "osrfMethodException",
3617                                                         ctx->request,
3618                                                         "Invalid class referenced in ORDER BY clause -- see error log for more details"
3619                                                 );
3620                                         jsonIteratorFree( class_itr );
3621                                         buffer_free( order_buf );
3622                                         free(having_buf);
3623                                         buffer_free(group_buf);
3624                                         buffer_free(sql_buf);
3625                                         if (defaultselhash) jsonObjectFree(defaultselhash);
3626                                         return NULL;
3627                                 }
3628
3629                                 osrfHash* field_list_def = order_class_info->fields;
3630
3631                                 if ( snode->type == JSON_HASH ) {
3632
3633                                         // Hash is keyed on field names from the current class.  For each field
3634                                         // there is another layer of hash to define the sorting details, if any,
3635                                         // or a string to indicate direction of sorting.
3636                                         jsonIterator* order_itr = jsonNewIterator( snode );
3637                                         while ( (onode = jsonIteratorNext( order_itr )) ) {
3638
3639                                                 osrfHash* field_def = osrfHashGet( field_list_def, order_itr->key );
3640                                                 if( !field_def ) {
3641                                                         osrfLogError(OSRF_LOG_MARK, "%s: Invalid field \"%s\" in ORDER BY clause",
3642                                                                         MODULENAME, order_itr->key );
3643                                                         if( ctx )
3644                                                                 osrfAppSessionStatus(
3645                                                                         ctx->session,
3646                                                                         OSRF_STATUS_INTERNALSERVERERROR,
3647                                                                         "osrfMethodException",
3648                                                                         ctx->request,
3649                                                                         "Invalid field in ORDER BY clause -- see error log for more details"
3650                                                                 );
3651                                                         jsonIteratorFree( order_itr );
3652                                                         jsonIteratorFree( class_itr );
3653                                                         buffer_free( order_buf );
3654                                                         free(having_buf);
3655                                                         buffer_free(group_buf);
3656                                                         buffer_free(sql_buf);
3657                                                         if (defaultselhash) jsonObjectFree(defaultselhash);
3658                                                         return NULL;
3659                                                 } else if( str_is_true( osrfHashGet( field_def, "virtual" ) ) ) {
3660                                                         osrfLogError(OSRF_LOG_MARK, "%s: Virtual field \"%s\" in ORDER BY clause",
3661                                                                  MODULENAME, order_itr->key );
3662                                                         if( ctx )
3663                                                                 osrfAppSessionStatus(
3664                                                                         ctx->session,
3665                                                                         OSRF_STATUS_INTERNALSERVERERROR,
3666                                                                         "osrfMethodException",
3667                                                                         ctx->request,
3668                                                                         "Virtual field in ORDER BY clause -- see error log for more details"
3669                                                         );
3670                                                         jsonIteratorFree( order_itr );
3671                                                         jsonIteratorFree( class_itr );
3672                                                         buffer_free( order_buf );
3673                                                         free(having_buf);
3674                                                         buffer_free(group_buf);
3675                                                         buffer_free(sql_buf);
3676                                                         if (defaultselhash) jsonObjectFree(defaultselhash);
3677                                                         return NULL;
3678                                                 }
3679
3680                                                 const char* direction = NULL;
3681                                                 if ( onode->type == JSON_HASH ) {
3682                                                         if ( jsonObjectGetKeyConst( onode, "transform" ) ) {
3683                                                                 string = searchFieldTransform(
3684                                                                         class_itr->key,
3685                                                                         osrfHashGet( field_list_def, order_itr->key ),
3686                                                                         onode
3687                                                                 );
3688                                                                 if( ! string ) {
3689                                                                         if( ctx ) osrfAppSessionStatus(
3690                                                                                 ctx->session,
3691                                                                                 OSRF_STATUS_INTERNALSERVERERROR,
3692                                                                                 "osrfMethodException",
3693                                                                                 ctx->request,
3694                                                                                 "Severe query error in ORDER BY clause -- see error log for more details"
3695                                                                         );
3696                                                                         jsonIteratorFree( order_itr );
3697                                                                         jsonIteratorFree( class_itr );
3698                                                                         free(having_buf);
3699                                                                         buffer_free(group_buf);
3700                                                                         buffer_free(order_buf);
3701                                                                         buffer_free(sql_buf);
3702                                                                         if (defaultselhash) jsonObjectFree(defaultselhash);
3703                                                                         return NULL;
3704                                                                 }
3705                                                         } else {
3706                                                                 growing_buffer* field_buf = buffer_init(16);
3707                                                                 buffer_fadd(field_buf, "\"%s\".%s", class_itr->key, order_itr->key);
3708                                                                 string = buffer_release(field_buf);
3709                                                         }
3710
3711                                                         if ( (tmp_const = jsonObjectGetKeyConst( onode, "direction" )) ) {
3712                                                                 const char* dir = jsonObjectGetString(tmp_const);
3713                                                                 if (!strncasecmp(dir, "d", 1)) {
3714                                                                         direction = " DESC";
3715                                                                 } else {
3716                                                                         direction = " ASC";
3717                                                                 }
3718                                                         }
3719
3720                                                 } else if ( JSON_NULL == onode->type || JSON_ARRAY == onode->type ) {
3721                                                         osrfLogError( OSRF_LOG_MARK,
3722                                                                 "%s: Expected JSON_STRING in ORDER BY clause; found %s",
3723                                                                 MODULENAME, json_type( onode->type ) );
3724                                                         if( ctx )
3725                                                                 osrfAppSessionStatus(
3726                                                                         ctx->session,
3727                                                                         OSRF_STATUS_INTERNALSERVERERROR,
3728                                                                         "osrfMethodException",
3729                                                                         ctx->request,
3730                                                                         "Malformed ORDER BY clause -- see error log for more details"
3731                                                                 );
3732                                                         jsonIteratorFree( order_itr );
3733                                                         jsonIteratorFree( class_itr );
3734                                                         free(having_buf);
3735                                                         buffer_free(group_buf);
3736                                                         buffer_free(order_buf);
3737                                                         buffer_free(sql_buf);
3738                                                         if (defaultselhash) jsonObjectFree(defaultselhash);
3739                                                         return NULL;
3740
3741                                                 } else {
3742                                                         string = strdup(order_itr->key);
3743                                                         const char* dir = jsonObjectGetString(onode);
3744                                                         if (!strncasecmp(dir, "d", 1)) {
3745                                                                 direction = " DESC";
3746                                                         } else {
3747                                                                 direction = " ASC";
3748                                                         }
3749                                                 }
3750
3751                                                 if ( order_buf )
3752                                                         OSRF_BUFFER_ADD(order_buf, ", ");
3753                                                 else
3754                                                         order_buf = buffer_init(128);
3755
3756                                                 OSRF_BUFFER_ADD(order_buf, string);
3757                                                 free(string);
3758
3759                                                 if (direction) {
3760                                                          OSRF_BUFFER_ADD(order_buf, direction);
3761                                                 }
3762
3763                                         } // end while
3764                                         jsonIteratorFree(order_itr);
3765
3766                                 } else if ( snode->type == JSON_ARRAY ) {
3767
3768                                         // Array is a list of fields from the current class
3769                                         unsigned long order_idx = 0;
3770                                         while(( onode = jsonObjectGetIndex( snode, order_idx++ ) )) {
3771
3772                                                 const char* _f = jsonObjectGetString( onode );
3773
3774                                                 osrfHash* field_def = osrfHashGet( field_list_def, _f );
3775                                                 if( !field_def ) {
3776                                                         osrfLogError(OSRF_LOG_MARK, "%s: Invalid field \"%s\" in ORDER BY clause",
3777                                                                         MODULENAME, _f );
3778                                                         if( ctx )
3779                                                                 osrfAppSessionStatus(
3780                                                                         ctx->session,
3781                                                                         OSRF_STATUS_INTERNALSERVERERROR,
3782                                                                         "osrfMethodException",
3783                                                                         ctx->request,
3784                                                                         "Invalid field in ORDER BY clause -- see error log for more details"
3785                                                                 );
3786                                                         jsonIteratorFree( class_itr );
3787                                                         buffer_free( order_buf );
3788                                                         free(having_buf);
3789                                                         buffer_free(group_buf);
3790                                                         buffer_free(sql_buf);
3791                                                         if (defaultselhash) jsonObjectFree(defaultselhash);
3792                                                         return NULL;
3793                                                 } else if( str_is_true( osrfHashGet( field_def, "virtual" ) ) ) {
3794                                                         osrfLogError(OSRF_LOG_MARK, "%s: Virtual field \"%s\" in ORDER BY clause",
3795                                                                         MODULENAME, _f );
3796                                                         if( ctx )
3797                                                                 osrfAppSessionStatus(
3798                                                                         ctx->session,
3799                                                                         OSRF_STATUS_INTERNALSERVERERROR,
3800                                                                         "osrfMethodException",
3801                                                                         ctx->request,
3802                                                                         "Virtual field in ORDER BY clause -- see error log for more details"
3803                                                                 );
3804                                                         jsonIteratorFree( class_itr );
3805                                                         buffer_free( order_buf );
3806                                                         free(having_buf);
3807                                                         buffer_free(group_buf);
3808                                                         buffer_free(sql_buf);
3809                                                         if (defaultselhash) jsonObjectFree(defaultselhash);
3810                                                         return NULL;
3811                                                 }
3812
3813                                                 if ( order_buf )
3814                                                         OSRF_BUFFER_ADD(order_buf, ", ");
3815                                                 else
3816                                                         order_buf = buffer_init(128);
3817
3818                                                 buffer_fadd( order_buf, "\"%s\".%s", class_itr->key, _f);
3819
3820                                         } // end while
3821
3822                                 // IT'S THE OOOOOOOOOOOLD STYLE!
3823                                 } else {
3824                                         osrfLogError(OSRF_LOG_MARK,
3825                                                         "%s: Possible SQL injection attempt; direct order by is not allowed", MODULENAME);
3826                                         if (ctx) {
3827                                                 osrfAppSessionStatus(
3828                                                         ctx->session,
3829                                                         OSRF_STATUS_INTERNALSERVERERROR,
3830                                                         "osrfMethodException",
3831                                                         ctx->request,
3832                                                         "Severe query error -- see error log for more details"
3833                                                 );
3834                                         }
3835
3836                                         free(having_buf);
3837                                         buffer_free(group_buf);
3838                                         buffer_free(order_buf);
3839                                         buffer_free(sql_buf);
3840                                         if (defaultselhash) jsonObjectFree(defaultselhash);
3841                                         jsonIteratorFree(class_itr);
3842                                         return NULL;
3843                                 }
3844                         } // end while
3845                         jsonIteratorFree( class_itr );
3846                 } else {
3847                         osrfLogError(OSRF_LOG_MARK,
3848                                 "%s: Malformed ORDER BY clause; expected JSON_HASH or JSON_ARRAY, found %s",
3849                                 MODULENAME, json_type( order_hash->type ) );
3850                         if( ctx )
3851                                 osrfAppSessionStatus(
3852                                         ctx->session,
3853                                         OSRF_STATUS_INTERNALSERVERERROR,
3854                                         "osrfMethodException",
3855                                         ctx->request,
3856                                         "Malformed ORDER BY clause -- see error log for more details"
3857                                 );
3858                         buffer_free( order_buf );
3859                         free(having_buf);
3860                         buffer_free(group_buf);
3861                         buffer_free(sql_buf);
3862                         if (defaultselhash) jsonObjectFree(defaultselhash);
3863                         return NULL;
3864                 }
3865
3866                 if( order_buf )
3867                         order_by_list = buffer_release( order_buf );
3868         }
3869
3870
3871         string = buffer_release(group_buf);
3872
3873         if ( *string && ( aggregate_found || (flags & SELECT_DISTINCT) ) ) {
3874                 OSRF_BUFFER_ADD( sql_buf, " GROUP BY " );
3875                 OSRF_BUFFER_ADD( sql_buf, string );
3876         }
3877
3878         free(string);
3879
3880         if( having_buf && *having_buf ) {
3881                 OSRF_BUFFER_ADD( sql_buf, " HAVING " );
3882                 OSRF_BUFFER_ADD( sql_buf, having_buf );
3883                 free( having_buf );
3884         }
3885
3886         if( order_by_list ) {
3887
3888                 if ( *order_by_list ) {
3889                         OSRF_BUFFER_ADD( sql_buf, " ORDER BY " );
3890                         OSRF_BUFFER_ADD( sql_buf, order_by_list );
3891                 }
3892
3893                 free( order_by_list );
3894         }
3895
3896         if ( limit ){
3897                 const char* str = jsonObjectGetString(limit);
3898                 buffer_fadd( sql_buf, " LIMIT %d", atoi(str) );
3899         }
3900
3901         if (offset) {
3902                 const char* str = jsonObjectGetString(offset);
3903                 buffer_fadd( sql_buf, " OFFSET %d", atoi(str) );
3904         }
3905
3906         if (!(flags & SUBSELECT)) OSRF_BUFFER_ADD_CHAR(sql_buf, ';');
3907
3908         if (defaultselhash) jsonObjectFree(defaultselhash);
3909
3910         return buffer_release(sql_buf);
3911
3912 } // end of SELECT()
3913
3914 static char* buildSELECT ( jsonObject* search_hash, jsonObject* order_hash, osrfHash* meta, osrfMethodContext* ctx ) {
3915
3916         const char* locale = osrf_message_get_last_locale();
3917
3918         osrfHash* fields = osrfHashGet(meta, "fields");
3919         char* core_class = osrfHashGet(meta, "classname");
3920
3921         const jsonObject* join_hash = jsonObjectGetKeyConst( order_hash, "join" );
3922
3923         jsonObject* node = NULL;
3924         jsonObject* snode = NULL;
3925         jsonObject* onode = NULL;
3926         const jsonObject* _tmp = NULL;
3927         jsonObject* selhash = NULL;
3928         jsonObject* defaultselhash = NULL;
3929
3930         growing_buffer* sql_buf = buffer_init(128);
3931         growing_buffer* select_buf = buffer_init(128);
3932
3933         if ( !(selhash = jsonObjectGetKey( order_hash, "select" )) ) {
3934                 defaultselhash = jsonNewObjectType(JSON_HASH);
3935                 selhash = defaultselhash;
3936         }
3937
3938         // If there's no SELECT list for the core class, build one
3939         if ( !jsonObjectGetKeyConst(selhash,core_class) ) {
3940                 jsonObject* field_list = jsonNewObjectType( JSON_ARRAY );
3941
3942                 // Add every non-virtual field to the field list
3943                 osrfHash* field_def = NULL;
3944                 osrfHashIterator* field_itr = osrfNewHashIterator( fields );
3945                 while( ( field_def = osrfHashIteratorNext( field_itr ) ) ) {
3946                         if( ! str_is_true( osrfHashGet( field_def, "virtual" ) ) ) {
3947                                 const char* field = osrfHashIteratorKey( field_itr );
3948                                 jsonObjectPush( field_list, jsonNewObject( field ) );
3949                         }
3950                 }
3951                 osrfHashIteratorFree( field_itr );
3952                 jsonObjectSetKey( selhash, core_class, field_list );
3953         }
3954
3955         int first = 1;
3956         jsonIterator* class_itr = jsonNewIterator( selhash );
3957         while ( (snode = jsonIteratorNext( class_itr )) ) {
3958
3959                 const char* cname = class_itr->key;
3960                 osrfHash* idlClass = osrfHashGet( oilsIDL(), cname );
3961                 if (!idlClass) continue;
3962
3963                 if (strcmp(core_class,class_itr->key)) {
3964                         if (!join_hash) continue;
3965
3966                         jsonObject* found =  jsonObjectFindPath(join_hash, "//%s", class_itr->key);
3967                         if (!found->size) {
3968                                 jsonObjectFree(found);
3969                                 continue;
3970                         }
3971
3972                         jsonObjectFree(found);
3973                 }
3974
3975                 jsonIterator* select_itr = jsonNewIterator( snode );
3976                 while ( (node = jsonIteratorNext( select_itr )) ) {
3977                         const char* item_str = jsonObjectGetString( node );
3978                         osrfHash* field = osrfHashGet( osrfHashGet( idlClass, "fields" ), item_str );
3979                         char* fname = osrfHashGet(field, "name");
3980
3981                         if (!field) continue;
3982
3983                         if (first) {
3984                                 first = 0;
3985                         } else {
3986                                 OSRF_BUFFER_ADD_CHAR(select_buf, ',');
3987                         }
3988
3989             if (locale) {
3990                         const char* i18n;
3991                                 const jsonObject* no_i18n_obj = jsonObjectGetKey( order_hash, "no_i18n" );
3992                                 if ( obj_is_true( no_i18n_obj ) )    // Suppress internationalization?
3993                                         i18n = NULL;
3994                                 else
3995                                         i18n = osrfHashGet(field, "i18n");
3996
3997                                 if( str_is_true( i18n ) ) {
3998                         char* pkey = osrfHashGet(idlClass, "primarykey");
3999                         char* tname = osrfHashGet(idlClass, "tablename");
4000
4001                     buffer_fadd(select_buf, " oils_i18n_xlate('%s', '%s', '%s', '%s', \"%s\".%s::TEXT, '%s') AS \"%s\"", tname, cname, fname, pkey, cname, pkey, locale, fname);
4002                 } else {
4003                                 buffer_fadd(select_buf, " \"%s\".%s", cname, fname);
4004                 }
4005             } else {
4006                             buffer_fadd(select_buf, " \"%s\".%s", cname, fname);
4007             }
4008                 }
4009
4010         jsonIteratorFree(select_itr);
4011         }
4012
4013     jsonIteratorFree(class_itr);
4014
4015         char* col_list = buffer_release(select_buf);
4016         char* table = getSourceDefinition(meta);
4017         if( !table )
4018                 table = strdup( "(null)" );
4019
4020         buffer_fadd(sql_buf, "SELECT %s FROM %s AS \"%s\"", col_list, table, core_class );
4021         free(col_list);
4022         free(table);
4023
4024         // Clear the query stack (as a fail-safe precaution against possible
4025         // leftover garbage); then push the first query frame onto the stack.
4026         clear_query_stack();
4027         push_query_frame();
4028         if( add_query_core( NULL, core_class ) ) {
4029                 if( ctx )
4030                         osrfAppSessionStatus(
4031                                 ctx->session,
4032                                 OSRF_STATUS_INTERNALSERVERERROR,
4033                                 "osrfMethodException",
4034                                 ctx->request,
4035                                 "Unable to build query frame for core class"
4036                         );
4037                 return NULL;
4038         }
4039
4040         if ( join_hash ) {
4041                 char* join_clause = searchJOIN( join_hash, &curr_query->core );
4042                 OSRF_BUFFER_ADD_CHAR(sql_buf, ' ');
4043                 OSRF_BUFFER_ADD(sql_buf, join_clause);
4044                 free(join_clause);
4045         }
4046
4047         osrfLogDebug(OSRF_LOG_MARK, "%s pre-predicate SQL =  %s",
4048                                  MODULENAME, OSRF_BUFFER_C_STR(sql_buf));
4049
4050         OSRF_BUFFER_ADD(sql_buf, " WHERE ");
4051
4052         char* pred = searchWHERE( search_hash, &curr_query->core, AND_OP_JOIN, ctx );
4053         if (!pred) {
4054                 osrfAppSessionStatus(
4055                         ctx->session,
4056                         OSRF_STATUS_INTERNALSERVERERROR,
4057                                 "osrfMethodException",
4058                                 ctx->request,
4059                                 "Severe query error -- see error log for more details"
4060                         );
4061                 buffer_free(sql_buf);
4062                 if(defaultselhash) jsonObjectFree(defaultselhash);
4063                 clear_query_stack();
4064                 return NULL;
4065         } else {
4066                 buffer_add(sql_buf, pred);
4067                 free(pred);
4068         }
4069
4070         if (order_hash) {
4071                 char* string = NULL;
4072                 if ( (_tmp = jsonObjectGetKeyConst( order_hash, "order_by" )) ){
4073
4074                         growing_buffer* order_buf = buffer_init(128);
4075
4076                         first = 1;
4077                         jsonIterator* class_itr = jsonNewIterator( _tmp );
4078                         while ( (snode = jsonIteratorNext( class_itr )) ) {
4079
4080                                 if (!jsonObjectGetKeyConst(selhash,class_itr->key))
4081                                         continue;
4082
4083                                 if ( snode->type == JSON_HASH ) {
4084
4085                                         jsonIterator* order_itr = jsonNewIterator( snode );
4086                                         while ( (onode = jsonIteratorNext( order_itr )) ) {
4087
4088                                                 osrfHash* field_def = oilsIDLFindPath( "/%s/fields/%s",
4089                                                                 class_itr->key, order_itr->key );
4090                                                 if ( !field_def )
4091                                                         continue;
4092
4093                                                 char* direction = NULL;
4094                                                 if ( onode->type == JSON_HASH ) {
4095                                                         if ( jsonObjectGetKeyConst( onode, "transform" ) ) {
4096                                                                 string = searchFieldTransform( class_itr->key, field_def, onode );
4097                                                                 if( ! string ) {
4098                                                                         osrfAppSessionStatus(
4099                                                                                 ctx->session,
4100                                                                                 OSRF_STATUS_INTERNALSERVERERROR,
4101                                                                                 "osrfMethodException",
4102                                                                                 ctx->request,
4103                                                                                 "Severe query error in ORDER BY clause -- see error log for more details"
4104                                                                         );
4105                                                                         jsonIteratorFree( order_itr );
4106                                                                         jsonIteratorFree( class_itr );
4107                                                                         buffer_free( order_buf );
4108                                                                         buffer_free( sql_buf );
4109                                                                         if( defaultselhash ) jsonObjectFree( defaultselhash );
4110                                                                         clear_query_stack();
4111                                                                         return NULL;
4112                                                                 }
4113                                                         } else {
4114                                                                 growing_buffer* field_buf = buffer_init(16);
4115                                                                 buffer_fadd(field_buf, "\"%s\".%s", class_itr->key, order_itr->key);
4116                                                                 string = buffer_release(field_buf);
4117                                                         }
4118
4119                                                         if ( (_tmp = jsonObjectGetKeyConst( onode, "direction" )) ) {
4120                                                                 const char* dir = jsonObjectGetString(_tmp);
4121                                                                 if (!strncasecmp(dir, "d", 1)) {
4122                                                                         direction = " DESC";
4123                                                                 } else {
4124                                                                         free(direction);
4125                                                                 }
4126                                                         }
4127
4128                                                 } else {
4129                                                         string = strdup(order_itr->key);
4130                                                         const char* dir = jsonObjectGetString(onode);
4131                                                         if (!strncasecmp(dir, "d", 1)) {
4132                                                                 direction = " DESC";
4133                                                         } else {
4134                                                                 direction = " ASC";
4135                                                         }
4136                                                 }
4137
4138                                                 if (first) {
4139                                                         first = 0;
4140                                                 } else {
4141                                                         buffer_add(order_buf, ", ");
4142                                                 }
4143
4144                                                 buffer_add(order_buf, string);
4145                                                 free(string);
4146
4147                                                 if (direction) {
4148                                                         buffer_add(order_buf, direction);
4149                                                 }
4150
4151                                         }
4152
4153                     jsonIteratorFree(order_itr);
4154
4155                                 } else {
4156                                         const char* str = jsonObjectGetString(snode);
4157                                         buffer_add(order_buf, str);
4158                                         break;
4159                                 }
4160
4161                         }
4162
4163                         jsonIteratorFree(class_itr);
4164
4165                         string = buffer_release(order_buf);
4166
4167                         if ( *string ) {
4168                                 OSRF_BUFFER_ADD( sql_buf, " ORDER BY " );
4169                                 OSRF_BUFFER_ADD( sql_buf, string );
4170                         }
4171
4172                         free(string);
4173                 }
4174
4175                 if ( (_tmp = jsonObjectGetKeyConst( order_hash, "limit" )) ){
4176                         const char* str = jsonObjectGetString(_tmp);
4177                         buffer_fadd(
4178                                 sql_buf,
4179                                 " LIMIT %d",
4180                                 atoi(str)
4181                         );
4182                 }
4183
4184                 _tmp = jsonObjectGetKeyConst( order_hash, "offset" );
4185                 if (_tmp) {
4186                         const char* str = jsonObjectGetString(_tmp);
4187                         buffer_fadd(
4188                                 sql_buf,
4189                                 " OFFSET %d",
4190                                 atoi(str)
4191                         );
4192                 }
4193         }
4194
4195         if (defaultselhash) jsonObjectFree(defaultselhash);
4196         clear_query_stack();
4197
4198         OSRF_BUFFER_ADD_CHAR(sql_buf, ';');
4199         return buffer_release(sql_buf);
4200 }
4201
4202 int doJSONSearch ( osrfMethodContext* ctx ) {
4203         if(osrfMethodVerifyContext( ctx )) {
4204                 osrfLogError( OSRF_LOG_MARK,  "Invalid method context" );
4205                 return -1;
4206         }
4207
4208         osrfLogDebug(OSRF_LOG_MARK, "Received query request");
4209
4210         int err = 0;
4211
4212         // XXX for now...
4213         dbhandle = writehandle;
4214
4215         jsonObject* hash = jsonObjectGetIndex(ctx->params, 0);
4216
4217         int flags = 0;
4218
4219         if ( obj_is_true( jsonObjectGetKey( hash, "distinct" ) ) )
4220                 flags |= SELECT_DISTINCT;
4221
4222         if ( obj_is_true( jsonObjectGetKey( hash, "no_i18n" ) ) )
4223                 flags |= DISABLE_I18N;
4224
4225         osrfLogDebug(OSRF_LOG_MARK, "Building SQL ...");
4226         char* sql = SELECT(
4227                         ctx,
4228                         jsonObjectGetKey( hash, "select" ),
4229                         jsonObjectGetKey( hash, "from" ),
4230                         jsonObjectGetKey( hash, "where" ),
4231                         jsonObjectGetKey( hash, "having" ),
4232                         jsonObjectGetKey( hash, "order_by" ),
4233                         jsonObjectGetKey( hash, "limit" ),
4234                         jsonObjectGetKey( hash, "offset" ),
4235                         flags
4236         );
4237         clear_query_stack();
4238
4239         if (!sql) {
4240                 err = -1;
4241                 return err;
4242         }
4243
4244         osrfLogDebug(OSRF_LOG_MARK, "%s SQL =  %s", MODULENAME, sql);
4245         dbi_result result = dbi_conn_query(dbhandle, sql);
4246
4247         if(result) {
4248                 osrfLogDebug(OSRF_LOG_MARK, "Query returned with no errors");
4249
4250                 if (dbi_result_first_row(result)) {
4251                         /* JSONify the result */
4252                         osrfLogDebug(OSRF_LOG_MARK, "Query returned at least one row");
4253
4254                         do {
4255                                 jsonObject* return_val = oilsMakeJSONFromResult( result );
4256                                 osrfAppRespond( ctx, return_val );
4257                 jsonObjectFree( return_val );
4258                         } while (dbi_result_next_row(result));
4259
4260                 } else {
4261                         osrfLogDebug(OSRF_LOG_MARK, "%s returned no results for query %s", MODULENAME, sql);
4262                 }
4263
4264                 osrfAppRespondComplete( ctx, NULL );
4265
4266                 /* clean up the query */
4267                 dbi_result_free(result);
4268
4269         } else {
4270                 err = -1;
4271                 osrfLogError(OSRF_LOG_MARK, "%s: Error with query [%s]", MODULENAME, sql);
4272                 osrfAppSessionStatus(
4273                         ctx->session,
4274                         OSRF_STATUS_INTERNALSERVERERROR,
4275                         "osrfMethodException",
4276                         ctx->request,
4277                         "Severe query error -- see error log for more details"
4278                 );
4279         }
4280
4281         free(sql);
4282         return err;
4283 }
4284
4285 static jsonObject* doFieldmapperSearch ( osrfMethodContext* ctx, osrfHash* meta,
4286                 jsonObject* where_hash, jsonObject* query_hash, int* err ) {
4287
4288         // XXX for now...
4289         dbhandle = writehandle;
4290
4291         osrfHash* links = osrfHashGet(meta, "links");
4292         osrfHash* fields = osrfHashGet(meta, "fields");
4293         char* core_class = osrfHashGet(meta, "classname");
4294         char* pkey = osrfHashGet(meta, "primarykey");
4295
4296         const jsonObject* _tmp;
4297         jsonObject* obj;
4298
4299         char* sql = buildSELECT( where_hash, query_hash, meta, ctx );
4300         if (!sql) {
4301                 osrfLogDebug(OSRF_LOG_MARK, "Problem building query, returning NULL");
4302                 *err = -1;
4303                 return NULL;
4304         }
4305
4306         osrfLogDebug(OSRF_LOG_MARK, "%s SQL =  %s", MODULENAME, sql);
4307
4308         dbi_result result = dbi_conn_query(dbhandle, sql);
4309         if( NULL == result ) {
4310                 osrfLogError(OSRF_LOG_MARK, "%s: Error retrieving %s with query [%s]",
4311                         MODULENAME, osrfHashGet(meta, "fieldmapper"), sql);
4312                 osrfAppSessionStatus(
4313                         ctx->session,
4314                         OSRF_STATUS_INTERNALSERVERERROR,
4315                         "osrfMethodException",
4316                         ctx->request,
4317                         "Severe query error -- see error log for more details"
4318                 );
4319                 *err = -1;
4320                 free(sql);
4321                 return jsonNULL;
4322
4323         } else {
4324                 osrfLogDebug(OSRF_LOG_MARK, "Query returned with no errors");
4325         }
4326
4327         jsonObject* res_list = jsonNewObjectType(JSON_ARRAY);
4328         osrfHash* dedup = osrfNewHash();
4329
4330         if (dbi_result_first_row(result)) {
4331                 /* JSONify the result */
4332                 osrfLogDebug(OSRF_LOG_MARK, "Query returned at least one row");
4333                 do {
4334                         obj = oilsMakeFieldmapperFromResult( result, meta );
4335                         char* pkey_val = oilsFMGetString( obj, pkey );
4336                         if ( osrfHashGet( dedup, pkey_val ) ) {
4337                                 jsonObjectFree(obj);
4338                                 free(pkey_val);
4339                         } else {
4340                                 osrfHashSet( dedup, pkey_val, pkey_val );
4341                                 jsonObjectPush(res_list, obj);
4342                         }
4343                 } while (dbi_result_next_row(result));
4344         } else {
4345                 osrfLogDebug(OSRF_LOG_MARK, "%s returned no results for query %s",
4346                         MODULENAME, sql );
4347         }
4348
4349         osrfHashFree(dedup);
4350         /* clean up the query */
4351         dbi_result_free(result);
4352         free(sql);
4353
4354         if (res_list->size && query_hash) {
4355                 _tmp = jsonObjectGetKeyConst( query_hash, "flesh" );
4356                 if (_tmp) {
4357                         int x = (int)jsonObjectGetNumber(_tmp);
4358                         if (x == -1 || x > max_flesh_depth) x = max_flesh_depth;
4359
4360                         const jsonObject* temp_blob;
4361                         if ((temp_blob = jsonObjectGetKeyConst( query_hash, "flesh_fields" )) && x > 0) {
4362
4363                                 jsonObject* flesh_blob = jsonObjectClone( temp_blob );
4364                                 const jsonObject* flesh_fields = jsonObjectGetKeyConst( flesh_blob, core_class );
4365
4366                                 osrfStringArray* link_fields = NULL;
4367
4368                                 if (flesh_fields) {
4369                                         if (flesh_fields->size == 1) {
4370                                                 const char* _t = jsonObjectGetString( jsonObjectGetIndex( flesh_fields, 0 ) );
4371                                                 if (!strcmp(_t,"*")) link_fields = osrfHashKeys( links );
4372                                         }
4373
4374                                         if (!link_fields) {
4375                                                 jsonObject* _f;
4376                                                 link_fields = osrfNewStringArray(1);
4377                                                 jsonIterator* _i = jsonNewIterator( flesh_fields );
4378                                                 while ((_f = jsonIteratorNext( _i ))) {
4379                                                         osrfStringArrayAdd( link_fields, jsonObjectGetString( _f ) );
4380                                                 }
4381                         jsonIteratorFree(_i);
4382                                         }
4383                                 }
4384
4385                                 jsonObject* cur;
4386                                 unsigned long res_idx = 0;
4387                                 while ((cur = jsonObjectGetIndex( res_list, res_idx++ ) )) {
4388
4389                                         int i = 0;
4390                                         char* link_field;
4391
4392                                         while ( (link_field = osrfStringArrayGetString(link_fields, i++)) ) {
4393
4394                                                 osrfLogDebug(OSRF_LOG_MARK, "Starting to flesh %s", link_field);
4395
4396                                                 osrfHash* kid_link = osrfHashGet(links, link_field);
4397                                                 if (!kid_link) continue;
4398
4399                                                 osrfHash* field = osrfHashGet(fields, link_field);
4400                                                 if (!field) continue;
4401
4402                                                 osrfHash* value_field = field;
4403
4404                                                 osrfHash* kid_idl = osrfHashGet(oilsIDL(), osrfHashGet(kid_link, "class"));
4405                                                 if (!kid_idl) continue;
4406
4407                                                 if (!(strcmp( osrfHashGet(kid_link, "reltype"), "has_many" ))) { // has_many
4408                                                         value_field = osrfHashGet( fields, osrfHashGet(meta, "primarykey") );
4409                                                 }
4410
4411                                                 if (!(strcmp( osrfHashGet(kid_link, "reltype"), "might_have" ))) { // might_have
4412                                                         value_field = osrfHashGet( fields, osrfHashGet(meta, "primarykey") );
4413                                                 }
4414
4415                                                 osrfStringArray* link_map = osrfHashGet( kid_link, "map" );
4416
4417                                                 if (link_map->size > 0) {
4418                                                         jsonObject* _kid_key = jsonNewObjectType(JSON_ARRAY);
4419                                                         jsonObjectPush(
4420                                                                 _kid_key,
4421                                                                 jsonNewObject( osrfStringArrayGetString( link_map, 0 ) )
4422                                                         );
4423
4424                                                         jsonObjectSetKey(
4425                                                                 flesh_blob,
4426                                                                 osrfHashGet(kid_link, "class"),
4427                                                                 _kid_key
4428                                                         );
4429                                                 };
4430
4431                                                 osrfLogDebug(
4432                                                         OSRF_LOG_MARK,
4433                                                         "Link field: %s, remote class: %s, fkey: %s, reltype: %s",
4434                                                         osrfHashGet(kid_link, "field"),
4435                                                         osrfHashGet(kid_link, "class"),
4436                                                         osrfHashGet(kid_link, "key"),
4437                                                         osrfHashGet(kid_link, "reltype")
4438                                                 );
4439
4440                                                 const char* search_key = jsonObjectGetString(
4441                                                         jsonObjectGetIndex(
4442                                                                 cur,
4443                                                                 atoi( osrfHashGet(value_field, "array_position") )
4444                                                         )
4445                                                 );
4446
4447                                                 if (!search_key) {
4448                                                         osrfLogDebug(OSRF_LOG_MARK, "Nothing to search for!");
4449                                                         continue;
4450                                                 }
4451
4452                                                 osrfLogDebug(OSRF_LOG_MARK, "Creating param objects...");
4453
4454                                                 // construct WHERE clause
4455                                                 jsonObject* where_clause  = jsonNewObjectType(JSON_HASH);
4456                                                 jsonObjectSetKey(
4457                                                         where_clause,
4458                                                         osrfHashGet(kid_link, "key"),
4459                                                         jsonNewObject( search_key )
4460                                                 );
4461
4462                                                 // construct the rest of the query
4463                                                 jsonObject* rest_of_query = jsonNewObjectType(JSON_HASH);
4464                                                 jsonObjectSetKey( rest_of_query, "flesh",
4465                                                         jsonNewNumberObject( (double)(x - 1 + link_map->size) )
4466                                                 );
4467
4468                                                 if (flesh_blob)
4469                                                         jsonObjectSetKey( rest_of_query, "flesh_fields", jsonObjectClone(flesh_blob) );
4470
4471                                                 if (jsonObjectGetKeyConst(query_hash, "order_by")) {
4472                                                         jsonObjectSetKey( rest_of_query, "order_by",
4473                                                                 jsonObjectClone(jsonObjectGetKeyConst(query_hash, "order_by"))
4474                                                         );
4475                                                 }
4476
4477                                                 if (jsonObjectGetKeyConst(query_hash, "select")) {
4478                                                         jsonObjectSetKey( rest_of_query, "select",
4479                                                                 jsonObjectClone(jsonObjectGetKeyConst(query_hash, "select"))
4480                                                         );
4481                                                 }
4482
4483                                                 jsonObject* kids = doFieldmapperSearch( ctx, kid_idl,
4484                                                         where_clause, rest_of_query, err);
4485
4486                                                 jsonObjectFree( where_clause );
4487                                                 jsonObjectFree( rest_of_query );
4488
4489                                                 if(*err) {
4490                                                         osrfStringArrayFree(link_fields);
4491                                                         jsonObjectFree(res_list);
4492                                                         jsonObjectFree(flesh_blob);
4493                                                         return jsonNULL;
4494                                                 }
4495
4496                                                 osrfLogDebug(OSRF_LOG_MARK, "Search for %s return %d linked objects", osrfHashGet(kid_link, "class"), kids->size);
4497
4498                                                 jsonObject* X = NULL;
4499                                                 if ( link_map->size > 0 && kids->size > 0 ) {
4500                                                         X = kids;
4501                                                         kids = jsonNewObjectType(JSON_ARRAY);
4502
4503                                                         jsonObject* _k_node;
4504                                                         unsigned long res_idx = 0;
4505                                                         while ((_k_node = jsonObjectGetIndex( X, res_idx++ ) )) {
4506                                                                 jsonObjectPush(
4507                                                                         kids,
4508                                                                         jsonObjectClone(
4509                                                                                 jsonObjectGetIndex(
4510                                                                                         _k_node,
4511                                                                                         (unsigned long)atoi(
4512                                                                                                 osrfHashGet(
4513                                                                                                         osrfHashGet(
4514                                                                                                                 osrfHashGet(
4515                                                                                                                         osrfHashGet(
4516                                                                                                                                 oilsIDL(),
4517                                                                                                                                 osrfHashGet(kid_link, "class")
4518                                                                                                                         ),
4519                                                                                                                         "fields"
4520                                                                                                                 ),
4521                                                                                                                 osrfStringArrayGetString( link_map, 0 )
4522                                                                                                         ),
4523                                                                                                         "array_position"
4524                                                                                                 )
4525                                                                                         )
4526                                                                                 )
4527                                                                         )
4528                                                                 );
4529                                                         } // end while loop traversing X
4530                                                 }
4531
4532                                                 if (!(strcmp( osrfHashGet(kid_link, "reltype"), "has_a" )) || !(strcmp( osrfHashGet(kid_link, "reltype"), "might_have" ))) {
4533                                                         osrfLogDebug(OSRF_LOG_MARK, "Storing fleshed objects in %s", osrfHashGet(kid_link, "field"));
4534                                                         jsonObjectSetIndex(
4535                                                                 cur,
4536                                                                 (unsigned long)atoi( osrfHashGet( field, "array_position" ) ),
4537                                                                 jsonObjectClone( jsonObjectGetIndex(kids, 0) )
4538                                                         );
4539                                                 }
4540
4541                                                 if (!(strcmp( osrfHashGet(kid_link, "reltype"), "has_many" ))) { // has_many
4542                                                         osrfLogDebug(OSRF_LOG_MARK, "Storing fleshed objects in %s", osrfHashGet(kid_link, "field"));
4543                                                         jsonObjectSetIndex(
4544                                                                 cur,
4545                                                                 (unsigned long)atoi( osrfHashGet( field, "array_position" ) ),
4546                                                                 jsonObjectClone( kids )
4547                                                         );
4548                                                 }
4549
4550                                                 if (X) {
4551                                                         jsonObjectFree(kids);
4552                                                         kids = X;
4553                                                 }
4554
4555                                                 jsonObjectFree( kids );
4556
4557                                                 osrfLogDebug(OSRF_LOG_MARK, "Fleshing of %s complete", osrfHashGet(kid_link, "field"));
4558                                                 osrfLogDebug(OSRF_LOG_MARK, "%s", jsonObjectToJSON(cur));
4559
4560                                         }
4561                                 } // end while loop traversing res_list
4562                                 jsonObjectFree( flesh_blob );
4563                                 osrfStringArrayFree(link_fields);
4564                         }
4565                 }
4566         }
4567
4568         return res_list;
4569 }
4570
4571
4572 static jsonObject* doUpdate(osrfMethodContext* ctx, int* err ) {
4573
4574         osrfHash* meta = osrfHashGet( (osrfHash*) ctx->method->userData, "class" );
4575 #ifdef PCRUD
4576         jsonObject* target = jsonObjectGetIndex( ctx->params, 1 );
4577 #else
4578         jsonObject* target = jsonObjectGetIndex( ctx->params, 0 );
4579 #endif
4580
4581         if (!verifyObjectClass(ctx, target)) {
4582                 *err = -1;
4583                 return jsonNULL;
4584         }
4585
4586         if (!osrfHashGet( (osrfHash*)ctx->session->userData, "xact_id" )) {
4587                 osrfAppSessionStatus(
4588                         ctx->session,
4589                         OSRF_STATUS_BADREQUEST,
4590                         "osrfMethodException",
4591                         ctx->request,
4592                         "No active transaction -- required for UPDATE"
4593                 );
4594                 *err = -1;
4595                 return jsonNULL;
4596         }
4597
4598         // The following test is harmless but redundant.  If a class is
4599         // readonly, we don't register an update method for it.
4600         if( str_is_true( osrfHashGet( meta, "readonly" ) ) ) {
4601                 osrfAppSessionStatus(
4602                         ctx->session,
4603                         OSRF_STATUS_BADREQUEST,
4604                         "osrfMethodException",
4605                         ctx->request,
4606                         "Cannot UPDATE readonly class"
4607                 );
4608                 *err = -1;
4609                 return jsonNULL;
4610         }
4611
4612         dbhandle = writehandle;
4613
4614         char* trans_id = osrfHashGet( (osrfHash*)ctx->session->userData, "xact_id" );
4615
4616         // Set the last_xact_id
4617         int index = oilsIDL_ntop( target->classname, "last_xact_id" );
4618         if (index > -1) {
4619                 osrfLogDebug(OSRF_LOG_MARK, "Setting last_xact_id to %s on %s at position %d",
4620                                 trans_id, target->classname, index);
4621                 jsonObjectSetIndex(target, index, jsonNewObject(trans_id));
4622         }
4623
4624         char* pkey = osrfHashGet(meta, "primarykey");
4625         osrfHash* fields = osrfHashGet(meta, "fields");
4626
4627         char* id = oilsFMGetString( target, pkey );
4628
4629         osrfLogDebug(
4630                 OSRF_LOG_MARK,
4631                 "%s updating %s object with %s = %s",
4632                 MODULENAME,
4633                 osrfHashGet(meta, "fieldmapper"),
4634                 pkey,
4635                 id
4636         );
4637
4638         growing_buffer* sql = buffer_init(128);
4639         buffer_fadd(sql,"UPDATE %s SET", osrfHashGet(meta, "tablename"));
4640
4641         int first = 1;
4642         osrfHash* field_def = NULL;
4643         osrfHashIterator* field_itr = osrfNewHashIterator( fields );
4644         while( (field_def = osrfHashIteratorNext( field_itr ) ) ) {
4645
4646                 // Skip virtual fields, and the primary key
4647                 if( str_is_true( osrfHashGet( field_def, "virtual") ) )
4648                         continue;
4649
4650                 const char* field_name = osrfHashIteratorKey( field_itr );
4651                 if( ! strcmp( field_name, pkey ) )
4652                         continue;
4653
4654                 const jsonObject* field_object = oilsFMGetObject( target, field_name );
4655
4656                 int value_is_numeric = 0;    // boolean
4657                 char* value;
4658                 if (field_object && field_object->classname) {
4659                         value = oilsFMGetString(
4660                                 field_object,
4661                                 (char*)oilsIDLFindPath("/%s/primarykey", field_object->classname)
4662             );
4663                 } else {
4664                         value = jsonObjectToSimpleString( field_object );
4665                         if( field_object && JSON_NUMBER == field_object->type )
4666                                 value_is_numeric = 1;
4667                 }
4668
4669                 osrfLogDebug( OSRF_LOG_MARK, "Updating %s object with %s = %s",
4670                                 osrfHashGet(meta, "fieldmapper"), field_name, value);
4671
4672                 if (!field_object || field_object->type == JSON_NULL) {
4673                         if ( !(!( strcmp( osrfHashGet(meta, "classname"), "au" ) )
4674                                         && !( strcmp( field_name, "passwd" ) )) ) { // arg at the special case!
4675                                 if (first) first = 0;
4676                                 else OSRF_BUFFER_ADD_CHAR(sql, ',');
4677                                 buffer_fadd( sql, " %s = NULL", field_name );
4678                         }
4679
4680                 } else if ( value_is_numeric || !strcmp( get_primitive( field_def ), "number") ) {
4681                         if (first) first = 0;
4682                         else OSRF_BUFFER_ADD_CHAR(sql, ',');
4683
4684                         const char* numtype = get_datatype( field_def );
4685                         if ( !strncmp( numtype, "INT", 3 ) ) {
4686                                 buffer_fadd( sql, " %s = %ld", field_name, atol(value) );
4687                         } else if ( !strcmp( numtype, "NUMERIC" ) ) {
4688                                 buffer_fadd( sql, " %s = %f", field_name, atof(value) );
4689                         } else {
4690                                 // Must really be intended as a string, so quote it
4691                                 if ( dbi_conn_quote_string(dbhandle, &value) ) {
4692                                         buffer_fadd( sql, " %s = %s", field_name, value );
4693                                 } else {
4694                                         osrfLogError(OSRF_LOG_MARK, "%s: Error quoting string [%s]", MODULENAME, value);
4695                                         osrfAppSessionStatus(
4696                                                 ctx->session,
4697                                                 OSRF_STATUS_INTERNALSERVERERROR,
4698                                                 "osrfMethodException",
4699                                                 ctx->request,
4700                                                 "Error quoting string -- please see the error log for more details"
4701                                         );
4702                                         free(value);
4703                                         free(id);
4704                                         osrfHashIteratorFree( field_itr );
4705                                         buffer_free(sql);
4706                                         *err = -1;
4707                                         return jsonNULL;
4708                                 }
4709                         }
4710
4711                         osrfLogDebug( OSRF_LOG_MARK, "%s is of type %s", field_name, numtype );
4712
4713                 } else {
4714                         if ( dbi_conn_quote_string(dbhandle, &value) ) {
4715                                 if (first) first = 0;
4716                                 else OSRF_BUFFER_ADD_CHAR(sql, ',');
4717                                 buffer_fadd( sql, " %s = %s", field_name, value );
4718
4719                         } else {
4720                                 osrfLogError(OSRF_LOG_MARK, "%s: Error quoting string [%s]", MODULENAME, value);
4721                                 osrfAppSessionStatus(
4722                                         ctx->session,
4723                                         OSRF_STATUS_INTERNALSERVERERROR,
4724                                         "osrfMethodException",
4725                                         ctx->request,
4726                                         "Error quoting string -- please see the error log for more details"
4727                                 );
4728                                 free(value);
4729                                 free(id);
4730                                 osrfHashIteratorFree( field_itr );
4731                                 buffer_free(sql);
4732                                 *err = -1;
4733                                 return jsonNULL;
4734                         }
4735                 }
4736
4737                 free(value);
4738
4739         } // end while
4740
4741         osrfHashIteratorFree( field_itr );
4742
4743         jsonObject* obj = jsonNewObject(id);
4744
4745         if ( strcmp( get_primitive( osrfHashGet( osrfHashGet(meta, "fields"), pkey ) ), "number" ) )
4746                 dbi_conn_quote_string(dbhandle, &id);
4747
4748         buffer_fadd( sql, " WHERE %s = %s;", pkey, id );
4749
4750         char* query = buffer_release(sql);
4751         osrfLogDebug(OSRF_LOG_MARK, "%s: Update SQL [%s]", MODULENAME, query);
4752
4753         dbi_result result = dbi_conn_query(dbhandle, query);
4754         free(query);
4755
4756         if (!result) {
4757                 jsonObjectFree(obj);
4758                 obj = jsonNewObject(NULL);
4759                 osrfLogError(
4760                         OSRF_LOG_MARK,
4761                         "%s ERROR updating %s object with %s = %s",
4762                         MODULENAME,
4763                         osrfHashGet(meta, "fieldmapper"),
4764                         pkey,
4765                         id
4766                 );
4767         }
4768
4769         free(id);
4770
4771         return obj;
4772 }
4773
4774 static jsonObject* doDelete(osrfMethodContext* ctx, int* err ) {
4775
4776         osrfHash* meta = osrfHashGet( (osrfHash*) ctx->method->userData, "class" );
4777
4778         if (!osrfHashGet( (osrfHash*)ctx->session->userData, "xact_id" )) {
4779                 osrfAppSessionStatus(
4780                         ctx->session,
4781                         OSRF_STATUS_BADREQUEST,
4782                         "osrfMethodException",
4783                         ctx->request,
4784                         "No active transaction -- required for DELETE"
4785                 );
4786                 *err = -1;
4787                 return jsonNULL;
4788         }
4789
4790         // The following test is harmless but redundant.  If a class is
4791         // readonly, we don't register a delete method for it.
4792         if( str_is_true( osrfHashGet( meta, "readonly" ) ) ) {
4793                 osrfAppSessionStatus(
4794                         ctx->session,
4795                         OSRF_STATUS_BADREQUEST,
4796                         "osrfMethodException",
4797                         ctx->request,
4798                         "Cannot DELETE readonly class"
4799                 );
4800                 *err = -1;
4801                 return jsonNULL;
4802         }
4803
4804         dbhandle = writehandle;
4805
4806         jsonObject* obj;
4807
4808         char* pkey = osrfHashGet(meta, "primarykey");
4809
4810         int _obj_pos = 0;
4811 #ifdef PCRUD
4812                 _obj_pos = 1;
4813 #endif
4814
4815         char* id;
4816         if (jsonObjectGetIndex(ctx->params, _obj_pos)->classname) {
4817                 if (!verifyObjectClass(ctx, jsonObjectGetIndex( ctx->params, _obj_pos ))) {
4818                         *err = -1;
4819                         return jsonNULL;
4820                 }
4821
4822                 id = oilsFMGetString( jsonObjectGetIndex(ctx->params, _obj_pos), pkey );
4823         } else {
4824 #ifdef PCRUD
4825         if (!verifyObjectPCRUD( ctx, NULL )) {
4826                         *err = -1;
4827                         return jsonNULL;
4828         }
4829 #endif
4830                 id = jsonObjectToSimpleString(jsonObjectGetIndex(ctx->params, _obj_pos));
4831         }
4832
4833         osrfLogDebug(
4834                 OSRF_LOG_MARK,
4835                 "%s deleting %s object with %s = %s",
4836                 MODULENAME,
4837                 osrfHashGet(meta, "fieldmapper"),
4838                 pkey,
4839                 id
4840         );
4841
4842         obj = jsonNewObject(id);
4843
4844         if ( strcmp( get_primitive( osrfHashGet( osrfHashGet(meta, "fields"), pkey ) ), "number" ) )
4845                 dbi_conn_quote_string(writehandle, &id);
4846
4847         dbi_result result = dbi_conn_queryf(writehandle, "DELETE FROM %s WHERE %s = %s;", osrfHashGet(meta, "tablename"), pkey, id);
4848
4849         if (!result) {
4850                 jsonObjectFree(obj);
4851                 obj = jsonNewObject(NULL);
4852                 osrfLogError(
4853                         OSRF_LOG_MARK,
4854                         "%s ERROR deleting %s object with %s = %s",
4855                         MODULENAME,
4856                         osrfHashGet(meta, "fieldmapper"),
4857                         pkey,
4858                         id
4859                 );
4860         }
4861
4862         free(id);
4863
4864         return obj;
4865
4866 }
4867
4868
4869 static jsonObject* oilsMakeFieldmapperFromResult( dbi_result result, osrfHash* meta) {
4870         if(!(result && meta)) return jsonNULL;
4871
4872         jsonObject* object = jsonNewObject(NULL);
4873         jsonObjectSetClass(object, osrfHashGet(meta, "classname"));
4874
4875         osrfHash* fields = osrfHashGet(meta, "fields");
4876
4877         osrfLogInternal(OSRF_LOG_MARK, "Setting object class to %s ", object->classname);
4878
4879         osrfHash* _f;
4880         time_t _tmp_dt;
4881         char dt_string[256];
4882         struct tm gmdt;
4883
4884         int fmIndex;
4885         int columnIndex = 1;
4886         int attr;
4887         unsigned short type;
4888         const char* columnName;
4889
4890         /* cycle through the column list */
4891         while( (columnName = dbi_result_get_field_name(result, columnIndex)) ) {
4892
4893                 osrfLogInternal(OSRF_LOG_MARK, "Looking for column named [%s]...", (char*)columnName);
4894
4895                 fmIndex = -1; // reset the position
4896
4897                 /* determine the field type and storage attributes */
4898                 type = dbi_result_get_field_type_idx(result, columnIndex);
4899                 attr = dbi_result_get_field_attribs_idx(result, columnIndex);
4900
4901                 /* fetch the fieldmapper index */
4902                 if( (_f = osrfHashGet(fields, (char*)columnName)) ) {
4903
4904                         if ( str_is_true( osrfHashGet(_f, "virtual") ) )
4905                                 continue;
4906
4907                         const char* pos = (char*)osrfHashGet(_f, "array_position");
4908                         if ( !pos ) continue;
4909
4910                         fmIndex = atoi( pos );
4911                         osrfLogInternal(OSRF_LOG_MARK, "... Found column at position [%s]...", pos);
4912                 } else {
4913                         continue;
4914                 }
4915
4916                 if (dbi_result_field_is_null_idx(result, columnIndex)) {
4917                         jsonObjectSetIndex( object, fmIndex, jsonNewObject(NULL) );
4918                 } else {
4919
4920                         switch( type ) {
4921
4922                                 case DBI_TYPE_INTEGER :
4923
4924                                         if( attr & DBI_INTEGER_SIZE8 )
4925                                                 jsonObjectSetIndex( object, fmIndex,
4926                                                         jsonNewNumberObject(dbi_result_get_longlong_idx(result, columnIndex)));
4927                                         else
4928                                                 jsonObjectSetIndex( object, fmIndex,
4929                                                         jsonNewNumberObject(dbi_result_get_int_idx(result, columnIndex)));
4930
4931                                         break;
4932
4933                                 case DBI_TYPE_DECIMAL :
4934                                         jsonObjectSetIndex( object, fmIndex,
4935                                                         jsonNewNumberObject(dbi_result_get_double_idx(result, columnIndex)));
4936                                         break;
4937
4938                                 case DBI_TYPE_STRING :
4939
4940
4941                                         jsonObjectSetIndex(
4942                                                 object,
4943                                                 fmIndex,
4944                                                 jsonNewObject( dbi_result_get_string_idx(result, columnIndex) )
4945                                         );
4946
4947                                         break;
4948
4949                                 case DBI_TYPE_DATETIME :
4950
4951                                         memset(dt_string, '\0', sizeof(dt_string));
4952                                         memset(&gmdt, '\0', sizeof(gmdt));
4953
4954                                         _tmp_dt = dbi_result_get_datetime_idx(result, columnIndex);
4955
4956
4957                                         if (!(attr & DBI_DATETIME_DATE)) {
4958                                                 gmtime_r( &_tmp_dt, &gmdt );
4959                                                 strftime(dt_string, sizeof(dt_string), "%T", &gmdt);
4960                                         } else if (!(attr & DBI_DATETIME_TIME)) {
4961                                                 localtime_r( &_tmp_dt, &gmdt );
4962                                                 strftime(dt_string, sizeof(dt_string), "%F", &gmdt);
4963                                         } else {
4964                                                 localtime_r( &_tmp_dt, &gmdt );
4965                                                 strftime(dt_string, sizeof(dt_string), "%FT%T%z", &gmdt);
4966                                         }
4967
4968                                         jsonObjectSetIndex( object, fmIndex, jsonNewObject(dt_string) );
4969
4970                                         break;
4971
4972                                 case DBI_TYPE_BINARY :
4973                                         osrfLogError( OSRF_LOG_MARK,
4974                                                 "Can't do binary at column %s : index %d", columnName, columnIndex);
4975                         }
4976                 }
4977                 ++columnIndex;
4978         }
4979
4980         return object;
4981 }
4982
4983 static jsonObject* oilsMakeJSONFromResult( dbi_result result ) {
4984         if(!result) return jsonNULL;
4985
4986         jsonObject* object = jsonNewObject(NULL);
4987
4988         time_t _tmp_dt;
4989         char dt_string[256];
4990         struct tm gmdt;
4991
4992         int fmIndex;
4993         int columnIndex = 1;
4994         int attr;
4995         unsigned short type;
4996         const char* columnName;
4997
4998         /* cycle through the column list */
4999         while( (columnName = dbi_result_get_field_name(result, columnIndex)) ) {
5000
5001                 osrfLogInternal(OSRF_LOG_MARK, "Looking for column named [%s]...", (char*)columnName);
5002
5003                 fmIndex = -1; // reset the position
5004
5005                 /* determine the field type and storage attributes */
5006                 type = dbi_result_get_field_type_idx(result, columnIndex);
5007                 attr = dbi_result_get_field_attribs_idx(result, columnIndex);
5008
5009                 if (dbi_result_field_is_null_idx(result, columnIndex)) {
5010                         jsonObjectSetKey( object, columnName, jsonNewObject(NULL) );
5011                 } else {
5012
5013                         switch( type ) {
5014
5015                                 case DBI_TYPE_INTEGER :
5016
5017                                         if( attr & DBI_INTEGER_SIZE8 )
5018                                                 jsonObjectSetKey( object, columnName,
5019                                                                 jsonNewNumberObject(dbi_result_get_longlong_idx(result, columnIndex)) );
5020                                         else
5021                                                 jsonObjectSetKey( object, columnName,
5022                                                                 jsonNewNumberObject(dbi_result_get_int_idx(result, columnIndex)) );
5023                                         break;
5024
5025                                 case DBI_TYPE_DECIMAL :
5026                                         jsonObjectSetKey( object, columnName,
5027                                                         jsonNewNumberObject(dbi_result_get_double_idx(result, columnIndex)) );
5028                                         break;
5029
5030                                 case DBI_TYPE_STRING :
5031                                         jsonObjectSetKey( object, columnName,
5032                                                         jsonNewObject(dbi_result_get_string_idx(result, columnIndex)) );
5033                                         break;
5034
5035                                 case DBI_TYPE_DATETIME :
5036
5037                                         memset(dt_string, '\0', sizeof(dt_string));
5038                                         memset(&gmdt, '\0', sizeof(gmdt));
5039
5040                                         _tmp_dt = dbi_result_get_datetime_idx(result, columnIndex);
5041
5042
5043                                         if (!(attr & DBI_DATETIME_DATE)) {
5044                                                 gmtime_r( &_tmp_dt, &gmdt );
5045                                                 strftime(dt_string, sizeof(dt_string), "%T", &gmdt);
5046                                         } else if (!(attr & DBI_DATETIME_TIME)) {
5047                                                 localtime_r( &_tmp_dt, &gmdt );
5048                                                 strftime(dt_string, sizeof(dt_string), "%F", &gmdt);
5049                                         } else {
5050                                                 localtime_r( &_tmp_dt, &gmdt );
5051                                                 strftime(dt_string, sizeof(dt_string), "%FT%T%z", &gmdt);
5052                                         }
5053
5054                                         jsonObjectSetKey( object, columnName, jsonNewObject(dt_string) );
5055                                         break;
5056
5057                                 case DBI_TYPE_BINARY :
5058                                         osrfLogError( OSRF_LOG_MARK,
5059                                                 "Can't do binary at column %s : index %d", columnName, columnIndex );
5060                         }
5061                 }
5062                 ++columnIndex;
5063         } // end while loop traversing result
5064
5065         return object;
5066 }
5067
5068 // Interpret a string as true or false
5069 static int str_is_true( const char* str ) {
5070         if( NULL == str || strcasecmp( str, "true" ) )
5071                 return 0;
5072         else
5073                 return 1;
5074 }
5075
5076 // Interpret a jsonObject as true or false
5077 static int obj_is_true( const jsonObject* obj ) {
5078         if( !obj )
5079                 return 0;
5080         else switch( obj->type )
5081         {
5082                 case JSON_BOOL :
5083                         if( obj->value.b )
5084                                 return 1;
5085                         else
5086                                 return 0;
5087                 case JSON_STRING :
5088                         if( strcasecmp( obj->value.s, "true" ) )
5089                                 return 0;
5090                         else
5091                                 return 1;
5092                 case JSON_NUMBER :          // Support 1/0 for perl's sake
5093                         if( jsonObjectGetNumber( obj ) == 1.0 )
5094                                 return 1;
5095                         else
5096                                 return 0;
5097                 default :
5098                         return 0;
5099         }
5100 }
5101
5102 // Translate a numeric code into a text string identifying a type of
5103 // jsonObject.  To be used for building error messages.
5104 static const char* json_type( int code ) {
5105         switch ( code )
5106         {
5107                 case 0 :
5108                         return "JSON_HASH";
5109                 case 1 :
5110                         return "JSON_ARRAY";
5111                 case 2 :
5112                         return "JSON_STRING";
5113                 case 3 :
5114                         return "JSON_NUMBER";
5115                 case 4 :
5116                         return "JSON_NULL";
5117                 case 5 :
5118                         return "JSON_BOOL";
5119                 default :
5120                         return "(unrecognized)";
5121         }
5122 }
5123
5124 // Extract the "primitive" attribute from an IDL field definition.
5125 // If we haven't initialized the app, then we must be running in
5126 // some kind of testbed.  In that case, default to "string".
5127 static const char* get_primitive( osrfHash* field ) {
5128         const char* s = osrfHashGet( field, "primitive" );
5129         if( !s ) {
5130                 if( child_initialized )
5131                         osrfLogError(
5132                                 OSRF_LOG_MARK,
5133                                 "%s ERROR No \"datatype\" attribute for field \"%s\"",
5134                                 MODULENAME,
5135                                 osrfHashGet( field, "name" )
5136                         );
5137                 else
5138                         s = "string";
5139         }
5140         return s;
5141 }
5142
5143 // Extract the "datatype" attribute from an IDL field definition.
5144 // If we haven't initialized the app, then we must be running in
5145 // some kind of testbed.  In that case, default to to NUMERIC,
5146 // since we look at the datatype only for numbers.
5147 static const char* get_datatype( osrfHash* field ) {
5148         const char* s = osrfHashGet( field, "datatype" );
5149         if( !s ) {
5150                 if( child_initialized )
5151                         osrfLogError(
5152                                 OSRF_LOG_MARK,
5153                                 "%s ERROR No \"datatype\" attribute for field \"%s\"",
5154                                 MODULENAME,
5155                                 osrfHashGet( field, "name" )
5156                         );
5157                 else
5158                         s = "NUMERIC";
5159         }
5160         return s;
5161 }
5162
5163 /*
5164 If the input string is potentially a valid SQL identifier, return 1.
5165 Otherwise return 0.
5166
5167 Purpose: to prevent certain kinds of SQL injection.  To that end we
5168 don't necessarily need to follow all the rules exactly, such as requiring
5169 that the first character not be a digit.
5170
5171 We allow leading and trailing white space.  In between, we do not allow
5172 punctuation (except for underscores and dollar signs), control
5173 characters, or embedded white space.
5174
5175 More pedantically we should allow quoted identifiers containing arbitrary
5176 characters, but for the foreseeable future such quoted identifiers are not
5177 likely to be an issue.
5178 */
5179 static int is_identifier( const char* s) {
5180         if( !s )
5181                 return 0;
5182
5183         // Skip leading white space
5184         while( isspace( (unsigned char) *s ) )
5185                 ++s;
5186
5187         if( !s )
5188                 return 0;   // Nothing but white space?  Not okay.
5189
5190         // Check each character until we reach white space or
5191         // end-of-string.  Letters, digits, underscores, and
5192         // dollar signs are okay. With the exception of periods
5193         // (as in schema.identifier), control characters and other
5194         // punctuation characters are not okay.  Anything else
5195         // is okay -- it could for example be part of a multibyte
5196         // UTF8 character such as a letter with diacritical marks,
5197         // and those are allowed.
5198         do {
5199                 if( isalnum( (unsigned char) *s )
5200                         || '.' == *s
5201                         || '_' == *s
5202                         || '$' == *s )
5203                         ;  // Fine; keep going
5204                 else if(   ispunct( (unsigned char) *s )
5205                                 || iscntrl( (unsigned char) *s ) )
5206                         return 0;
5207                         ++s;
5208         } while( *s && ! isspace( (unsigned char) *s ) );
5209
5210         // If we found any white space in the above loop,
5211         // the rest had better be all white space.
5212
5213         while( isspace( (unsigned char) *s ) )
5214                 ++s;
5215
5216         if( *s )
5217                 return 0;   // White space was embedded within non-white space
5218
5219         return 1;
5220 }
5221
5222 /*
5223 Determine whether to accept a character string as a comparison operator.
5224 Return 1 if it's good, or 0 if it's bad.
5225
5226 We don't validate it for real.  We just make sure that it doesn't contain
5227 any semicolons or white space (with special exceptions for a few specific
5228 operators).   The idea is to block certain kinds of SQL injection.  If it
5229 has no semicolons or white space but it's still not a valid operator, then
5230 the database will complain.
5231
5232 Another approach would be to compare the string against a short list of
5233 approved operators.  We don't do that because we want to allow custom
5234 operators like ">100*", which would be difficult or impossible to
5235 express otherwise in a JSON query.
5236 */
5237 static int is_good_operator( const char* op ) {
5238         if( !op ) return 0;   // Sanity check
5239
5240         const char* s = op;
5241         while( *s ) {
5242                 if( isspace( (unsigned char) *s ) ) {
5243                         // Special exceptions for SIMILAR TO, IS DISTINCT FROM,
5244                         // and IS NOT DISTINCT FROM.
5245                         if( !strcasecmp( op, "similar to" ) )
5246                                 return 1;
5247                         else if( !strcasecmp( op, "is distinct from" ) )
5248                                 return 1;
5249                         else if( !strcasecmp( op, "is not distinct from" ) )
5250                                 return 1;
5251                         else
5252                                 return 0;
5253                 }
5254                 else if( ';' == *s )
5255                         return 0;
5256                 ++s;
5257         }
5258         return 1;
5259 }
5260
5261 /* ----------------------------------------------------------------------------------
5262 The following machinery supports a stack of query frames for use by SELECT().
5263
5264 A query frame caches information about one level of a SELECT query.  When we enter
5265 a subquery, we push another query frame onto the stack, and pop it off when we leave.
5266
5267 The query frame stores information about the core class, and about any joined classes
5268 in the FROM clause.
5269
5270 The main purpose is to map table aliases to classes and tables, so that a query can
5271 join to the same table more than once.  A secondary goal is to reduce the number of
5272 lookups in the IDL by caching the results.
5273  ----------------------------------------------------------------------------------*/
5274
5275 #define STATIC_CLASS_INFO_COUNT 3
5276
5277 static ClassInfo static_class_info[ STATIC_CLASS_INFO_COUNT ];
5278
5279 /* ---------------------------------------------------------------------------
5280  Allocate a ClassInfo as raw memory.  Except for the in_use flag, we don't
5281  initialize it here.
5282  ---------------------------------------------------------------------------*/
5283 static ClassInfo* allocate_class_info( void ) {
5284         // In order to reduce the number of mallocs and frees, we return a static
5285         // instance of ClassInfo, if we can find one that we're not already using.
5286         // We rely on the fact that the compiler will implicitly initialize the
5287         // static instances so that in_use == 0.
5288
5289         int i;
5290         for( i = 0; i < STATIC_CLASS_INFO_COUNT; ++i ) {
5291                 if( ! static_class_info[ i ].in_use ) {
5292                         static_class_info[ i ].in_use = 1;
5293                         return static_class_info + i;
5294                 }
5295         }
5296
5297         // The static ones are all in use.  Malloc one.
5298
5299         return safe_malloc( sizeof( ClassInfo ) );
5300 }
5301
5302 /* --------------------------------------------------------------------------
5303  Free any malloc'd memory owned by a ClassInfo; return it to a pristine state
5304 ---------------------------------------------------------------------------*/
5305 static void clear_class_info( ClassInfo* info ) {
5306         // Sanity check
5307         if( ! info )
5308                 return;
5309
5310         // Free any malloc'd strings
5311
5312         if( info->alias != info->alias_store )
5313                 free( info->alias );
5314
5315         if( info->class_name != info->class_name_store )
5316                 free( info->class_name );
5317
5318         free( info->source_def );
5319
5320         info->alias = info->class_name = info->source_def = NULL;
5321         info->next = NULL;
5322 }
5323
5324 /* --------------------------------------------------------------------------
5325  Deallocate a ClassInfo and everything it owns
5326 ---------------------------------------------------------------------------*/
5327 static void free_class_info( ClassInfo* info ) {
5328         // Sanity check
5329         if( ! info )
5330                 return;
5331
5332         clear_class_info( info );
5333
5334         // If it's one of the static instances, just mark it as not in use
5335
5336         int i;
5337         for( i = 0; i < STATIC_CLASS_INFO_COUNT; ++i ) {
5338                 if( info == static_class_info + i ) {
5339                         static_class_info[ i ].in_use = 0;
5340                         return;
5341                 }
5342         }
5343
5344         // Otherwise it must have been malloc'd, so free it
5345
5346         free( info );
5347 }
5348
5349 /* --------------------------------------------------------------------------
5350  Populate an already-allocated ClassInfo.  Return 0 if successful, 1 if not.
5351 ---------------------------------------------------------------------------*/
5352 static int build_class_info( ClassInfo* info, const char* alias, const char* class ) {
5353         // Sanity checks
5354         if( ! info ){
5355                 osrfLogError( OSRF_LOG_MARK,
5356                                           "%s ERROR: No ClassInfo available to populate", MODULENAME );
5357                 info->alias = info->class_name = info->source_def = NULL;
5358                 info->class_def = info->fields = info->links = NULL;
5359                 return 1;
5360         }
5361
5362         if( ! class ) {
5363                 osrfLogError( OSRF_LOG_MARK,
5364                                           "%s ERROR: No class name provided for lookup", MODULENAME );
5365                 info->alias = info->class_name = info->source_def = NULL;
5366                 info->class_def = info->fields = info->links = NULL;
5367                 return 1;
5368         }
5369
5370         // Alias defaults to class name if not supplied
5371         if( ! alias || ! alias[ 0 ] )
5372                 alias = class;
5373
5374         // Look up class info in the IDL
5375         osrfHash* class_def = osrfHashGet( oilsIDL(), class );
5376         if( ! class_def ) {
5377                 osrfLogError( OSRF_LOG_MARK,
5378                                           "%s ERROR: Class %s not defined in IDL", MODULENAME, class );
5379                 info->alias = info->class_name = info->source_def = NULL;
5380                 info->class_def = info->fields = info->links = NULL;
5381                 return 1;
5382         } else if( str_is_true( osrfHashGet( class_def, "virtual" ) ) ) {
5383                 osrfLogError( OSRF_LOG_MARK,
5384                                           "%s ERROR: Class %s is defined as virtual", MODULENAME, class );
5385                 info->alias = info->class_name = info->source_def = NULL;
5386                 info->class_def = info->fields = info->links = NULL;
5387                 return 1;
5388         }
5389
5390         osrfHash* links = osrfHashGet( class_def, "links" );
5391         if( ! links ) {
5392                 osrfLogError( OSRF_LOG_MARK,
5393                                           "%s ERROR: No links defined in IDL for class %s", MODULENAME, class );
5394                 info->alias = info->class_name = info->source_def = NULL;
5395                 info->class_def = info->fields = info->links = NULL;
5396                 return 1;
5397         }
5398
5399         osrfHash* fields = osrfHashGet( class_def, "fields" );
5400         if( ! fields ) {
5401                 osrfLogError( OSRF_LOG_MARK,
5402                                           "%s ERROR: No fields defined in IDL for class %s", MODULENAME, class );
5403                 info->alias = info->class_name = info->source_def = NULL;
5404                 info->class_def = info->fields = info->links = NULL;
5405                 return 1;
5406         }
5407
5408         char* source_def = getSourceDefinition( class_def );
5409         if( ! source_def )
5410                 return 1;
5411
5412         // We got everything we need, so populate the ClassInfo
5413         if( strlen( alias ) > ALIAS_STORE_SIZE )
5414                 info->alias = strdup( alias );
5415         else {
5416                 strcpy( info->alias_store, alias );
5417                 info->alias = info->alias_store;
5418         }
5419
5420         if( strlen( class ) > CLASS_NAME_STORE_SIZE )
5421                 info->class_name = strdup( class );
5422         else {
5423                 strcpy( info->class_name_store, class );
5424                 info->class_name = info->class_name_store;
5425         }
5426
5427         info->source_def = source_def;
5428
5429         info->class_def = class_def;
5430         info->links     = links;
5431         info->fields    = fields;
5432
5433         return 0;
5434 }
5435
5436 #define STATIC_FRAME_COUNT 3
5437
5438 static QueryFrame static_frame[ STATIC_FRAME_COUNT ];
5439
5440 /* ---------------------------------------------------------------------------
5441  Allocate a ClassInfo as raw memory.  Except for the in_use flag, we don't
5442  initialize it here.
5443  ---------------------------------------------------------------------------*/
5444 static QueryFrame* allocate_frame( void ) {
5445         // In order to reduce the number of mallocs and frees, we return a static
5446         // instance of QueryFrame, if we can find one that we're not already using.
5447         // We rely on the fact that the compiler will implicitly initialize the
5448         // static instances so that in_use == 0.
5449
5450         int i;
5451         for( i = 0; i < STATIC_FRAME_COUNT; ++i ) {
5452                 if( ! static_frame[ i ].in_use ) {
5453                         static_frame[ i ].in_use = 1;
5454                         return static_frame + i;
5455                 }
5456         }
5457
5458         // The static ones are all in use.  Malloc one.
5459
5460         return safe_malloc( sizeof( QueryFrame ) );
5461 }
5462
5463 /* --------------------------------------------------------------------------
5464  Free a QueryFrame, and all the memory it owns.
5465 ---------------------------------------------------------------------------*/
5466 static void free_query_frame( QueryFrame* frame ) {
5467         // Sanity check
5468         if( ! frame )
5469                 return;
5470
5471         clear_class_info( &frame->core );
5472
5473         // Free the join list
5474         ClassInfo* temp;
5475         ClassInfo* info = frame->join_list;
5476         while( info ) {
5477                 temp = info->next;
5478                 free_class_info( info );
5479                 info = temp;
5480         }
5481
5482         frame->join_list = NULL;
5483         frame->next = NULL;
5484
5485         // If the frame is a static instance, just mark it as unused
5486         int i;
5487         for( i = 0; i < STATIC_FRAME_COUNT; ++i ) {
5488                 if( frame == static_frame + i ) {
5489                         static_frame[ i ].in_use = 0;
5490                         return;
5491                 }
5492         }
5493
5494         // Otherwise it must have been malloc'd, so free it
5495
5496         free( frame );
5497 }
5498
5499 /* --------------------------------------------------------------------------
5500  Search a given QueryFrame for a specified alias.  If you find it, return
5501  a pointer to the corresponding ClassInfo.  Otherwise return NULL.
5502 ---------------------------------------------------------------------------*/
5503 static ClassInfo* search_alias_in_frame( QueryFrame* frame, const char* target ) {
5504         if( ! frame || ! target ) {
5505                 return NULL;
5506         }
5507
5508         ClassInfo* found_class = NULL;
5509
5510         if( !strcmp( target, frame->core.alias ) )
5511                 return &(frame->core);
5512         else {
5513                 ClassInfo* curr_class = frame->join_list;
5514                 while( curr_class ) {
5515                         if( strcmp( target, curr_class->alias ) )
5516                                 curr_class = curr_class->next;
5517                         else {
5518                                 found_class = curr_class;
5519                                 break;
5520                         }
5521                 }
5522         }
5523
5524         return found_class;
5525 }
5526
5527 /* --------------------------------------------------------------------------
5528  Push a new (blank) QueryFrame onto the stack.
5529 ---------------------------------------------------------------------------*/
5530 static void push_query_frame( void ) {
5531         QueryFrame* frame = allocate_frame();
5532         frame->join_list = NULL;
5533         frame->next = curr_query;
5534
5535         // Initialize the ClassInfo for the core class
5536         ClassInfo* core = &frame->core;
5537         core->alias = core->class_name = core->source_def = NULL;
5538         core->class_def = core->fields = core->links = NULL;
5539
5540         curr_query = frame;
5541 }
5542
5543 /* --------------------------------------------------------------------------
5544  Pop a QueryFrame off the stack and destroy it
5545 ---------------------------------------------------------------------------*/
5546 static void pop_query_frame( void ) {
5547         // Sanity check
5548         if( ! curr_query )
5549                 return;
5550
5551         QueryFrame* popped = curr_query;
5552         curr_query = popped->next;
5553
5554         free_query_frame( popped );
5555 }
5556
5557 /* --------------------------------------------------------------------------
5558  Populate the ClassInfo for the core class.  Return 0 if successful, 1 if not.
5559 ---------------------------------------------------------------------------*/
5560 static int add_query_core( const char* alias, const char* class_name ) {
5561
5562         // Sanity checks
5563         if( ! curr_query ) {
5564                 osrfLogError( OSRF_LOG_MARK,
5565                                           "%s ERROR: No QueryFrame available for class %s", MODULENAME, class_name );
5566                 return 1;
5567         } else if( curr_query->core.alias ) {
5568                 osrfLogError( OSRF_LOG_MARK,
5569                                           "%s ERROR: Core class %s already populated as %s",
5570                                           MODULENAME, curr_query->core.class_name, curr_query->core.alias );
5571                 return 1;
5572         }
5573
5574         build_class_info( &curr_query->core, alias, class_name );
5575         if( curr_query->core.alias )
5576                 return 0;
5577         else {
5578                 osrfLogError( OSRF_LOG_MARK,
5579                                           "%s ERROR: Unable to look up core class %s", MODULENAME, class_name );
5580                 return 1;
5581         }
5582 }
5583
5584 /* --------------------------------------------------------------------------
5585  Search the current QueryFrame for a specified alias.  If you find it,
5586  return a pointer to the corresponding ClassInfo.  Otherwise return NULL.
5587 ---------------------------------------------------------------------------*/
5588 static ClassInfo* search_alias( const char* target ) {
5589         return search_alias_in_frame( curr_query, target );
5590 }
5591
5592 /* --------------------------------------------------------------------------
5593  Search all levels of query for a specified alias, starting with the
5594  current query.  If you find it, return a pointer to the corresponding
5595  ClassInfo.  Otherwise return NULL.
5596 ---------------------------------------------------------------------------*/
5597 static ClassInfo* search_all_alias( const char* target ) {
5598         ClassInfo* found_class = NULL;
5599         QueryFrame* curr_frame = curr_query;
5600
5601         while( curr_frame ) {
5602                 if(( found_class = search_alias_in_frame( curr_frame, target ) ))
5603                         break;
5604                 else
5605                         curr_frame = curr_frame->next;
5606         }
5607
5608         return found_class;
5609 }
5610
5611 /* --------------------------------------------------------------------------
5612  Add a class to the list of classes joined to the current query.
5613 ---------------------------------------------------------------------------*/
5614 static ClassInfo* add_joined_class( const char* alias, const char* classname ) {
5615
5616         if( ! classname || ! *classname ) {    // sanity check
5617                 osrfLogError( OSRF_LOG_MARK, "Can't join a class with no class name" );
5618                 return NULL;
5619         }
5620
5621         if( ! alias )
5622                 alias = classname;
5623
5624         const ClassInfo* conflict = search_alias( alias );
5625         if( conflict ) {
5626                 osrfLogError( OSRF_LOG_MARK,
5627                                           "%s ERROR: Table alias \"%s\" conflicts with class \"%s\"",
5628                                           MODULENAME, alias, conflict->class_name );
5629                 return NULL;
5630         }
5631
5632         ClassInfo* info = allocate_class_info();
5633
5634         if( build_class_info( info, alias, classname ) ) {
5635                 free_class_info( info );
5636                 return NULL;
5637         }
5638
5639         // Add the new ClassInfo to the join list of the current QueryFrame
5640         info->next = curr_query->join_list;
5641         curr_query->join_list = info;
5642
5643         return info;
5644 }
5645
5646 /* --------------------------------------------------------------------------
5647  Destroy all nodes on the query stack.
5648 ---------------------------------------------------------------------------*/
5649 static void clear_query_stack( void ) {
5650         while( curr_query )
5651                 pop_query_frame();
5652 }