osrf_json_gateway is tested and working. removing this older version
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Sat, 25 Feb 2006 03:22:24 +0000 (03:22 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Sat, 25 Feb 2006 03:22:24 +0000 (03:22 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/trunk@3185 dcc99617-32d9-48b4-a31d-7c20da2025e4

OpenSRF/src/gateway/mod_ils_gateway.c [deleted file]
OpenSRF/src/gateway/mod_ils_gateway.h [deleted file]

diff --git a/OpenSRF/src/gateway/mod_ils_gateway.c b/OpenSRF/src/gateway/mod_ils_gateway.c
deleted file mode 100644 (file)
index c2aace5..0000000
+++ /dev/null
@@ -1,235 +0,0 @@
-#include "mod_ils_gateway.h"
-#include "http_log.h"
-
-char* ils_gateway_config_file = NULL;
-char* ils_rest_gateway_config_file = NULL;
-
-static const char* ils_gateway_set_config(cmd_parms *parms, void *config, const char *arg) {
-       ils_gateway_config  *cfg;
-       cfg = ap_get_module_config(parms->server->module_config, &ils_gateway_module);
-       cfg->configfile = (char*) arg;
-       ils_gateway_config_file = (char*) arg;
-       return NULL;
-}
-
-/* tell apache about our commands */
-static const command_rec ils_gateway_cmds[] = {
-       AP_INIT_TAKE1( GATEWAY_CONFIG, ils_gateway_set_config, NULL, RSRC_CONF, "gateway config file"),
-       {NULL}
-};
-
-/* build the config object */
-static void* ils_gateway_create_config( apr_pool_t* p, server_rec* s) {
-       ils_gateway_config* cfg = (ils_gateway_config*) apr_palloc(p, sizeof(ils_gateway_config));
-       cfg->configfile = GATEWAY_DEFAULT_CONFIG;
-       return (void*) cfg;
-}
-
-
-static void mod_ils_gateway_child_init(apr_pool_t *p, server_rec *s) {
-
-       char* cfg = ils_gateway_config_file;
-       if( ! osrf_system_bootstrap_client( cfg, CONFIG_CONTEXT) ) {
-               osrfLogError( OSRF_LOG_MARK, "Unable to bootstrap client in gateway...");
-               return;
-       }
-       fprintf(stderr, "Bootstrapping %d\n", getpid() );
-       fflush(stderr);
-}
-
-static int mod_ils_gateway_method_handler (request_rec *r) {
-
-       /* make sure we're needed first thing*/
-       if (strcmp(r->handler, MODULE_NAME )) 
-               return DECLINED;
-       
-       osrfLogSetAppname("osrf_json_gw");
-
-       apr_pool_t *p = r->pool;        /* memory pool */
-       char* arg = r->args;                    /* url query string */
-
-       char* service                                   = NULL; /* service to connect to */
-       char* method                                    = NULL; /* method to perform */
-       int api_level                                   = 1;
-
-       string_array* sarray                    = init_string_array(12); /* method parameters */
-
-       growing_buffer* buffer          = NULL; /* POST data */
-       growing_buffer* tmp_buf         = NULL; /* temp buffer */
-
-       char* key                                               = NULL; /* query item name */
-       char* val                                               = NULL; /* query item value */
-
-       jsonObject* response                    = jsonParseString("{\"status\":200}");
-       jsonObject* payload                     = jsonParseString("[ ]");
-       jsonObjectSetKey(response, "payload", payload );
-
-       /* verify we are connected */
-       if(!osrf_system_get_transport_client()) {
-               osrfLogError( OSRF_LOG_MARK, "Bootstrap Failed, no transport client");
-               return HTTP_INTERNAL_SERVER_ERROR;
-       }
-
-       ap_set_content_type(r, "text/plain");
-       osrfLogDebug( OSRF_LOG_MARK, "Apache request method: %s", r->method );
-
-       /* gather the post args and append them to the url query string */
-       if( !strcmp(r->method,"POST") ) {
-
-               ap_setup_client_block(r,REQUEST_CHUNKED_DECHUNK);
-
-               if(! ap_should_client_block(r)) {
-                       osrfLogWarning( OSRF_LOG_MARK, "No Post Body");
-                       ap_rputs("null", r);
-                       return OK;
-               }
-
-               int BUFL = 1024;
-               char body[BUFL];
-               bzero(body, BUFL);
-               buffer = buffer_init(BUFL);
-
-               while(ap_get_client_block(r, body, BUFL - 1 )) {
-                       buffer_add( buffer, body );
-                       bzero(body, BUFL);
-               }
-
-               if( buffer->n_used < 1 ) {
-                       osrfLogWarning( OSRF_LOG_MARK, "No Post Body");
-                       ap_rputs("null", r);
-                       return OK;
-               }
-
-               if(arg && strlen(arg) > 0 ) {
-                       tmp_buf = buffer_init(BUFL);
-                       buffer_add(tmp_buf,arg);
-                       buffer_add(tmp_buf,buffer->buf);
-                       arg = (char*) apr_pstrdup(p, tmp_buf->buf);
-                       buffer_free(tmp_buf);
-               } else {
-                       arg = (char*) apr_pstrdup(p, buffer->buf);
-               }
-               buffer_free(buffer);
-
-       } 
-
-       if( ! arg || strlen(arg) == 0 ) { /* we received no request */
-               osrfLogWarning( OSRF_LOG_MARK, "No Args");
-               ap_rputs("null", r);
-               return OK;
-       }
-
-       osrfLogDebug( OSRF_LOG_MARK, "URL: %s", arg );
-       ap_log_rerror( APLOG_MARK, APLOG_DEBUG, 0, r, "URL: %s", arg );
-
-       r->allowed |= (AP_METHOD_BIT << M_GET);
-       r->allowed |= (AP_METHOD_BIT << M_POST);
-       
-       while( arg && (val = ap_getword(p, (const char**) &arg, '&'))) {
-
-               key = ap_getword(r->pool, (const char**) &val, '=');
-               if(!key || !key[0])
-                       break;
-
-               ap_unescape_url((char*)key);
-               ap_unescape_url((char*)val);
-
-               fprintf(stderr, "URL KEY: %s\n", key);
-               fflush(stderr);
-
-               if(!strcmp(key,"service")) 
-                       service = val;
-
-               if(!strcmp(key,"method"))
-                       method = val;
-
-               if(!strcmp(key,"param"))
-                       string_array_add(sarray, val);
-
-               if(!strcmp(key, "api_level")) 
-                       api_level = atoi(val);
-
-               if(!strcmp(key, "echo")) {
-                       if(val) ap_rputs(val,r);
-                       else ap_rputs("1",r);
-                       return OK;  /** XXX CLEAN UP MEMORY HERE */
-               }
-       }
-
-       fprintf(stderr, "DONE URL KEY: %s %d\n", key, api_level);
-       fflush(stderr);
-
-       osrfLogInfo( OSRF_LOG_MARK, "\r\nPerforming(%d):  service %s "
-                       "| method %s |", getpid(), service, method );
-
-       int k;
-       for( k = 0; k!= sarray->size; k++ ) {
-               osrfLogInfo( OSRF_LOG_MARK,  "param %s", string_array_get_string(sarray,k));
-       }
-
-       osrf_app_session* session = osrf_app_client_session_init(service);
-
-       osrfLogDebug( OSRF_LOG_MARK, "session service: %s", session->remote_service );
-
-       int req_id = osrf_app_session_make_req( session, NULL, method, api_level, sarray );
-       string_array_destroy(sarray);
-
-       osrf_message* omsg = NULL;
-
-       while((omsg = osrf_app_session_request_recv( session, req_id, 60 ))) {
-
-               jsonObjectSetKey(response, "status", jsonNewNumberObject(omsg->status_code));
-
-               if( omsg->_result_content ) {
-                       jsonObjectPush( payload, jsonObjectClone(omsg->_result_content));
-       
-               } else {
-
-                       if( omsg->status_code > 299 ) {
-                               char* s = omsg->status_name ? omsg->status_name : "Unknown Error";
-                               char* t = omsg->status_text ? omsg->status_text : "No Error Message";
-                               jsonObjectSetKey(response, "debug", jsonNewObject("\n\n%s:\n%s\n", s, t));
-                               osrfLogError( OSRF_LOG_MARK,  "Gateway received error: %s", 
-                                               jsonObjectGetString(jsonObjectGetKey(response, "debug")));
-                               break;
-                       }
-               }
-
-               osrf_message_free(omsg);
-               omsg = NULL;
-       }
-
-       char* content = jsonObjectToJSON(response);
-       if(content) {
-               osrfLogInfo( OSRF_LOG_MARK,  "Gateway responding with:  %s", content );
-               ap_rputs(content,r);
-               free(content);
-       } 
-       jsonObjectFree(response);
-
-       osrf_app_session_request_finish( session, req_id );
-       osrfLogDebug( OSRF_LOG_MARK, "gateway processed message successfully");
-
-       osrf_app_session_destroy(session);
-       return OK;
-}
-
-static void mod_ils_gateway_register_hooks (apr_pool_t *p) {
-       ap_hook_handler(mod_ils_gateway_method_handler, NULL, NULL, APR_HOOK_MIDDLE);
-       ap_hook_child_init(mod_ils_gateway_child_init,NULL,NULL,APR_HOOK_MIDDLE);
-}
-
-
-module AP_MODULE_DECLARE_DATA ils_gateway_module = {
-       STANDARD20_MODULE_STUFF,
-       NULL,
-       NULL,
-       ils_gateway_create_config,
-       NULL,
-       ils_gateway_cmds,
-       mod_ils_gateway_register_hooks,
-};
-
-
-
-
diff --git a/OpenSRF/src/gateway/mod_ils_gateway.h b/OpenSRF/src/gateway/mod_ils_gateway.h
deleted file mode 100644 (file)
index 1e08243..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "httpd.h"
-#include "http_config.h"
-#include "http_core.h"
-#include "http_protocol.h"
-#include "apr_compat.h"
-#include "apr_strings.h"
-
-/* our stuff */
-#include "opensrf/transport_client.h"
-#include "opensrf/osrf_message.h"
-#include "opensrf/osrf_app_session.h"
-#include "string_array.h"
-#include "md5.h"
-#include "objson/object.h"
-#include "objson/json_parser.h"
-
-#define MODULE_NAME "ils_gateway_module"
-#define GATEWAY_CONFIG "ILSGatewayConfig"
-#define CONFIG_CONTEXT "gateway"
-
-#define GATEWAY_DEFAULT_CONFIG "/openils/conf/opensrf_core.xml"
-
-
-/* our config structure */
-typedef struct { 
-       char* configfile;  /* our bootstrap config file */
-} ils_gateway_config;
-
-module AP_MODULE_DECLARE_DATA ils_gateway_module;
-