From: erickson Date: Wed, 20 Feb 2008 00:27:37 +0000 (+0000) Subject: mergin in some trunk changes X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=acc3b348665cac7fe330a378787790414bf5509b;p=Evergreen.git mergin in some trunk changes svn merge -r8460:8461 svn://svn.open-ils.org/ILS/trunk/ svn merge -r8458:8459 svn://svn.open-ils.org/ILS/trunk/ git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8792 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/include/openils/idl_fieldmapper.h b/Open-ILS/include/openils/idl_fieldmapper.h new file mode 100644 index 0000000000..f7f2df254b --- /dev/null +++ b/Open-ILS/include/openils/idl_fieldmapper.h @@ -0,0 +1,18 @@ +/* This set of macros will emulate the old style libfieldmapper api + * using the new liboils_idl interface. You MUST initiallize liboils_idl! + */ + +#ifndef FIELDMAPPER_API + +#ifndef OILS_IDL_API +#include "oils_idl.h" +#endif + +#define FIELDMAPPER_API + +#define fm_pton(x,y) oilsIDL_pton(x,y) +#define fm_ntop(x,y) oilsIDL_ntop(x,y) +#define isFieldmapper(x) oilsIDL_classIsFieldmapper(x) + +#endif + diff --git a/Open-ILS/include/openils/oils_constants.h b/Open-ILS/include/openils/oils_constants.h new file mode 100644 index 0000000000..6eb8fbde05 --- /dev/null +++ b/Open-ILS/include/openils/oils_constants.h @@ -0,0 +1,14 @@ + + +/* Settings ------------------------------------------------------ */ +#define OILS_ORG_SETTING_OPAC_TIMEOUT "auth.opac_timeout" +#define OILS_ORG_SETTING_STAFF_TIMEOUT "auth.staff_timeout" +#define OILS_ORG_SETTING_TEMP_TIMEOUT "auth.temp_timeout" + + +/* Events ------------------------------------------------------ */ +#define OILS_EVENT_SUCCESS "SUCCESS" +#define OILS_EVENT_AUTH_FAILED "LOGIN_FAILED" +#define OILS_EVENT_PERM_FAILURE "PERM_FAILURE" +#define OILS_EVENT_NO_SESSION "NO_SESSION" + diff --git a/Open-ILS/include/openils/oils_event.h b/Open-ILS/include/openils/oils_event.h new file mode 100644 index 0000000000..64af3070a1 --- /dev/null +++ b/Open-ILS/include/openils/oils_event.h @@ -0,0 +1,59 @@ +#ifndef OILS_EVENT_HEADER +#define OILS_EVENT_HEADER +#include "objson/object.h" +#include "opensrf/utils.h" +#include "opensrf/log.h" +#include "opensrf/osrf_hash.h" + + +/* OILS Event structure */ +struct _oilsEventStruct { + char* event; /* the event name */ + char* perm; /* the permission error name */ + int permloc; /* the permission location id */ + jsonObject* payload; /* the payload */ + jsonObject* json; /* the event as a jsonObject */ + char* file; + int line; +}; +typedef struct _oilsEventStruct oilsEvent; + + +/** Creates a new event. User is responsible for freeing event with oilsEventFree */ +oilsEvent* oilsNewEvent( char* file, int line, char* event ); + +/** Creates a new event with payload. + * User is responsible for freeing event with oilsEventFree */ +oilsEvent* oilsNewEvent2( char* file, int line, char* event, jsonObject* payload ); + +/** Creates a new event with permission and permission location. + * User is responsible for freeing event with oilsEventFree */ +oilsEvent* oilsNewEvent3( char* file, int line, char* event, char* perm, int permloc ); + +/** Creates a new event with permission, permission location, and payload. + * User is responsible for freeing event with oilsEventFree */ +oilsEvent* oilsNewEvent4( char* file, int line, + char* event, char* perm, int permloc, jsonObject* payload ); + +/** Sets the permission info for the event */ +void oilsEventSetPermission( oilsEvent* event, char* perm, int permloc ); + +/* Sets the payload for the event + * This clones the payload, so the user is responsible + * for handling the payload object's memory + * */ +void oilsEventSetPayload( oilsEvent* event, jsonObject* payload ); + +/** Creates the JSON associated with an event. The JSON should NOT be + * freed by the user. It will be freed by oilsEventFree */ +jsonObject* oilsEventToJSON( oilsEvent* event ); + +/* Parses the events file */ +void _oilsEventParseEvents(); + +/* Frees an event object */ +void oilsEventFree( oilsEvent* event ); + + + +#endif diff --git a/Open-ILS/include/openils/oils_idl.h b/Open-ILS/include/openils/oils_idl.h new file mode 100644 index 0000000000..de44f55e34 --- /dev/null +++ b/Open-ILS/include/openils/oils_idl.h @@ -0,0 +1,51 @@ +#include "opensrf/log.h" +#include "opensrf/utils.h" +#include "opensrf/osrf_hash.h" + +#ifndef OILS_IDL_API +#define OILS_IDL_API + +osrfHash* oilsIDLInit( const char* ); +osrfHash* oilsIDL(void); +osrfHash* oilsIDLFindPath( const char*, ... ); + +/* The oilsIDL hash looks like this: + +{ aws : { + classname : "aws", + fieldmapper : "actor::workstation", + tablename : "actor.workstation", optional + sequence : "actor.workstation_id_seq", optional + primarykey : "id", + virtual : "true", optional, "true" | "false" + fields : { + isnew : { + name : "isnew", + array_position : "0", + virtual : "true", "true" | "false" + primitive : "number" optional, JSON primitive (number, string, array, + object, bool) + }, + ... + }, + links : { + record : { + field : "owning_lib", field above that links to another class + rel_type : "has_a", link type, "has_a" | "has_many" | "might_have" + class : "aou", the foreign class that is linked + key : "id", the foreign class's key that creates the link to "field" + map : [] osrfStringArray used by cstore in "has_many" rel_types to + point through a linking class + }, + ... + }, + ... +} + +*/ + +int oilsIDL_classIsFieldmapper(const char*); +char * oilsIDL_pton(const char *, int); +int oilsIDL_ntop(const char *, const char *); + +#endif diff --git a/Open-ILS/include/openils/oils_utils.h b/Open-ILS/include/openils/oils_utils.h new file mode 100644 index 0000000000..64a785fd8f --- /dev/null +++ b/Open-ILS/include/openils/oils_utils.h @@ -0,0 +1,112 @@ +#include "objson/object.h" +#include "opensrf/log.h" + +// XXX replacing this with liboils_idl implementation +// #include "openils/fieldmapper_lookup.h" + +#include "openils/idl_fieldmapper.h" + +#include "oils_event.h" +#include "oils_constants.h" +#include "opensrf/osrf_app_session.h" +#include "opensrf/osrf_settings.h" + +/** + Loads the IDL. Returns NULL on failure + or a pointer to the IDL data structure on success. + @param idl_filename If not provided, we'll fetch the + filename from the settings server + */ +osrfHash* oilsInitIDL( char* idl_filename ); + +/** + Returns the string value for field 'field' in the given object. + This method calls jsonObjectToSimpleString so numbers will be + returned as strings. + @param object The object to inspect + @param field The field whose value is requsted + @return The string at the given position, if none exists, + then NULL is returned. The caller must free the returned string + */ +char* oilsFMGetString( const jsonObject* object, const char* field ); + + +/** + Returns the jsonObject found at the specified field in the + given object. + @param object The object to inspect + @param field The field whose value is requsted + @return The found object or NULL if none exists. Do NOT free the + returned object. + */ +const jsonObject* oilsFMGetObject( const jsonObject* object, const char* field ); + +/** + Sets the given field in the given object to the given string + @param object The object to update + @param field The field to change + @param string The new data + @return 0 if the field was updated successfully, -1 on error + */ +int oilsFMSetString( jsonObject* object, const char* field, const char* string ); + +/** + * Returns the data stored in the id field of the object if it exists + * returns -1 if the id field or the id value is not found + */ +long oilsFMGetObjectId( const jsonObject* obj ); + + +/** + * Checks if the user has each permission at the given org unit + * Passing in a -1 for the orgid means to use the top level org unit + * The first permission that fails causes the corresponding permission + * failure event to be returned + * returns NULL if all permissions succeed + */ +oilsEvent* oilsUtilsCheckPerms( int userid, int orgid, char* permissions[], int size ); + + +/** + * Performs a single request and returns the resulting data + * Caller is responsible for freeing the returned response object + */ +jsonObject* oilsUtilsQuickReq( const char* service, const char* method, + const jsonObject* params ); + +jsonObject* oilsUtilsStorageReq( const char* method, const jsonObject* params ); + +jsonObject* oilsUtilsCStoreReq( const char* method, const jsonObject* params ); + +/** + * Searches the storage server for a user with the given username + * Caller is responsible for freeing the returned object + */ +jsonObject* oilsUtilsFetchUserByUsername( const char* name ); + + +/** + * Returns the setting value + * Caller must free the returned string + */ +char* oilsUtilsFetchOrgSetting( int orgid, const char* setting ); + + +/** + * Logs into the auth server with the given username and password + * @return The authtoken string which must be de-allocated by the caller + */ +char* oilsUtilsLogin( const char* uname, const char* passwd, const char* type, int orgId ); + + +/** + * Fetches the requested workstation object by id + */ +jsonObject* oilsUtilsFetchWorkstation( long id ); + +jsonObject* oilsUtilsFetchUserByBarcode(const char* barcode); + +jsonObject* oilsUtilsFetchWorkstationByName( const char* name ); + + +int oilsUtilsIsDBTrue( const char* val ); diff --git a/Open-ILS/src/Makefile b/Open-ILS/src/Makefile index fff0bad178..ec7082cc69 100644 --- a/Open-ILS/src/Makefile +++ b/Open-ILS/src/Makefile @@ -2,7 +2,7 @@ export LDFLAGS += -L . -L$(TMP) -L $(OPENSRF_LIBS) export CFLAGS += -pipe -g -Wall -O2 -fPIC -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) \ - -D_LARGEFILE64_SOURCE -I$(LIBXML2_HEADERS)/libxml -I$(TMP) -I$(OPENSRF_HEADERS) + -D_LARGEFILE64_SOURCE -I$(LIBXML2_HEADERS)/libxml -I$(TMP) -I$(OPENSRF_HEADERS) export INCDIR = "$(INCLUDEDIR)/openils/" diff --git a/Open-ILS/src/c-apps/Makefile b/Open-ILS/src/c-apps/Makefile index c39465cd56..0ac65fca4b 100644 --- a/Open-ILS/src/c-apps/Makefile +++ b/Open-ILS/src/c-apps/Makefile @@ -1,6 +1,6 @@ LDLIBS += -lobjson -lopensrf #-lfieldmapper LDFLAGS += -Wl,-rpath=$(LIBDIR) -L$(DBI_LIBS) -CFLAGS += -DOSRF_LOG_PARAMS +CFLAGS += -DOSRF_LOG_PARAMS -I../../include #all: oils_auth.so oils_fetch.so oils_cstore.so all: liboils_idl.so oils_auth.so oils_cstore.so oils_rstore.so oils_dataloader @@ -22,7 +22,7 @@ oils_cstore.so: oils_cstore.o liboils_utils.so liboils_idl.so $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) -loils_idl -ldbi -loils_utils -ldbdpgsql oils_cstore.o -o $@ oils_rstore.o: oils_cstore.c - $(CC) $(CFLAGS) -I$(TMP) -DRSTORE -c -o $@ oils_cstore.c + $(CC) $(CFLAGS) -DRSTORE -c -o $@ oils_cstore.c oils_rstore.so: oils_rstore.o liboils_utils.so liboils_idl.so @echo $@ @@ -36,11 +36,7 @@ oils_idl-core.o: oils_idl-core.c liboils_idl.so: oils_idl-core.o @echo $@ - $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) oils_idl-core.o -o $@ -# cp $@ $(TMP)/ -# mkdir -p $(TMP)/openils/ -# cp oils_idl.h $(TMP)/openils/ -# cp idl_fieldmapper.h $(TMP)/openils/ + $(CC) $(CFLAGS) -shared -W1 $(LDLIBS) $(LDFLAGS) oils_idl-core.o -o $@ oils_auth.so: oils_auth.o liboils_utils.so @echo $@ @@ -49,23 +45,17 @@ oils_auth.so: oils_auth.o liboils_utils.so liboils_utils.so: oils_utils.o oils_event.o @echo $@ $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) oils_utils.o oils_event.o -o $@ -# cp $@ $(TMP)/ -# mkdir -p $(TMP)/openils/ -# cp oils_event.h $(TMP)/openils/ -# cp oils_utils.h $(TMP)/openils/ -# cp oils_constants.h $(TMP)/openils/ install: @echo $@; cp oils_auth.so $(LIBDIR)/ - #cp $(TMP)/oils_fetch.so $(LIBDIR)/ cp oils_cstore.so $(LIBDIR)/ cp oils_rstore.so $(LIBDIR)/ cp liboils_utils.so $(LIBDIR)/ cp liboils_idl.so $(LIBDIR)/ cp oils_dataloader $(BINDIR)/ mkdir -p $(INCDIR)/ - cp openils/*.h $(INCDIR)/ + cp ../../include/openils/*.h $(INCDIR)/ clean: @echo $@; diff --git a/Open-ILS/src/c-apps/openils/idl_fieldmapper.h b/Open-ILS/src/c-apps/openils/idl_fieldmapper.h deleted file mode 100644 index f7f2df254b..0000000000 --- a/Open-ILS/src/c-apps/openils/idl_fieldmapper.h +++ /dev/null @@ -1,18 +0,0 @@ -/* This set of macros will emulate the old style libfieldmapper api - * using the new liboils_idl interface. You MUST initiallize liboils_idl! - */ - -#ifndef FIELDMAPPER_API - -#ifndef OILS_IDL_API -#include "oils_idl.h" -#endif - -#define FIELDMAPPER_API - -#define fm_pton(x,y) oilsIDL_pton(x,y) -#define fm_ntop(x,y) oilsIDL_ntop(x,y) -#define isFieldmapper(x) oilsIDL_classIsFieldmapper(x) - -#endif - diff --git a/Open-ILS/src/c-apps/openils/oils_constants.h b/Open-ILS/src/c-apps/openils/oils_constants.h deleted file mode 100644 index 6eb8fbde05..0000000000 --- a/Open-ILS/src/c-apps/openils/oils_constants.h +++ /dev/null @@ -1,14 +0,0 @@ - - -/* Settings ------------------------------------------------------ */ -#define OILS_ORG_SETTING_OPAC_TIMEOUT "auth.opac_timeout" -#define OILS_ORG_SETTING_STAFF_TIMEOUT "auth.staff_timeout" -#define OILS_ORG_SETTING_TEMP_TIMEOUT "auth.temp_timeout" - - -/* Events ------------------------------------------------------ */ -#define OILS_EVENT_SUCCESS "SUCCESS" -#define OILS_EVENT_AUTH_FAILED "LOGIN_FAILED" -#define OILS_EVENT_PERM_FAILURE "PERM_FAILURE" -#define OILS_EVENT_NO_SESSION "NO_SESSION" - diff --git a/Open-ILS/src/c-apps/openils/oils_event.h b/Open-ILS/src/c-apps/openils/oils_event.h deleted file mode 100644 index 64af3070a1..0000000000 --- a/Open-ILS/src/c-apps/openils/oils_event.h +++ /dev/null @@ -1,59 +0,0 @@ -#ifndef OILS_EVENT_HEADER -#define OILS_EVENT_HEADER -#include "objson/object.h" -#include "opensrf/utils.h" -#include "opensrf/log.h" -#include "opensrf/osrf_hash.h" - - -/* OILS Event structure */ -struct _oilsEventStruct { - char* event; /* the event name */ - char* perm; /* the permission error name */ - int permloc; /* the permission location id */ - jsonObject* payload; /* the payload */ - jsonObject* json; /* the event as a jsonObject */ - char* file; - int line; -}; -typedef struct _oilsEventStruct oilsEvent; - - -/** Creates a new event. User is responsible for freeing event with oilsEventFree */ -oilsEvent* oilsNewEvent( char* file, int line, char* event ); - -/** Creates a new event with payload. - * User is responsible for freeing event with oilsEventFree */ -oilsEvent* oilsNewEvent2( char* file, int line, char* event, jsonObject* payload ); - -/** Creates a new event with permission and permission location. - * User is responsible for freeing event with oilsEventFree */ -oilsEvent* oilsNewEvent3( char* file, int line, char* event, char* perm, int permloc ); - -/** Creates a new event with permission, permission location, and payload. - * User is responsible for freeing event with oilsEventFree */ -oilsEvent* oilsNewEvent4( char* file, int line, - char* event, char* perm, int permloc, jsonObject* payload ); - -/** Sets the permission info for the event */ -void oilsEventSetPermission( oilsEvent* event, char* perm, int permloc ); - -/* Sets the payload for the event - * This clones the payload, so the user is responsible - * for handling the payload object's memory - * */ -void oilsEventSetPayload( oilsEvent* event, jsonObject* payload ); - -/** Creates the JSON associated with an event. The JSON should NOT be - * freed by the user. It will be freed by oilsEventFree */ -jsonObject* oilsEventToJSON( oilsEvent* event ); - -/* Parses the events file */ -void _oilsEventParseEvents(); - -/* Frees an event object */ -void oilsEventFree( oilsEvent* event ); - - - -#endif diff --git a/Open-ILS/src/c-apps/openils/oils_idl.h b/Open-ILS/src/c-apps/openils/oils_idl.h deleted file mode 100644 index de44f55e34..0000000000 --- a/Open-ILS/src/c-apps/openils/oils_idl.h +++ /dev/null @@ -1,51 +0,0 @@ -#include "opensrf/log.h" -#include "opensrf/utils.h" -#include "opensrf/osrf_hash.h" - -#ifndef OILS_IDL_API -#define OILS_IDL_API - -osrfHash* oilsIDLInit( const char* ); -osrfHash* oilsIDL(void); -osrfHash* oilsIDLFindPath( const char*, ... ); - -/* The oilsIDL hash looks like this: - -{ aws : { - classname : "aws", - fieldmapper : "actor::workstation", - tablename : "actor.workstation", optional - sequence : "actor.workstation_id_seq", optional - primarykey : "id", - virtual : "true", optional, "true" | "false" - fields : { - isnew : { - name : "isnew", - array_position : "0", - virtual : "true", "true" | "false" - primitive : "number" optional, JSON primitive (number, string, array, - object, bool) - }, - ... - }, - links : { - record : { - field : "owning_lib", field above that links to another class - rel_type : "has_a", link type, "has_a" | "has_many" | "might_have" - class : "aou", the foreign class that is linked - key : "id", the foreign class's key that creates the link to "field" - map : [] osrfStringArray used by cstore in "has_many" rel_types to - point through a linking class - }, - ... - }, - ... -} - -*/ - -int oilsIDL_classIsFieldmapper(const char*); -char * oilsIDL_pton(const char *, int); -int oilsIDL_ntop(const char *, const char *); - -#endif diff --git a/Open-ILS/src/c-apps/openils/oils_utils.h b/Open-ILS/src/c-apps/openils/oils_utils.h deleted file mode 100644 index 64a785fd8f..0000000000 --- a/Open-ILS/src/c-apps/openils/oils_utils.h +++ /dev/null @@ -1,112 +0,0 @@ -#include "objson/object.h" -#include "opensrf/log.h" - -// XXX replacing this with liboils_idl implementation -// #include "openils/fieldmapper_lookup.h" - -#include "openils/idl_fieldmapper.h" - -#include "oils_event.h" -#include "oils_constants.h" -#include "opensrf/osrf_app_session.h" -#include "opensrf/osrf_settings.h" - -/** - Loads the IDL. Returns NULL on failure - or a pointer to the IDL data structure on success. - @param idl_filename If not provided, we'll fetch the - filename from the settings server - */ -osrfHash* oilsInitIDL( char* idl_filename ); - -/** - Returns the string value for field 'field' in the given object. - This method calls jsonObjectToSimpleString so numbers will be - returned as strings. - @param object The object to inspect - @param field The field whose value is requsted - @return The string at the given position, if none exists, - then NULL is returned. The caller must free the returned string - */ -char* oilsFMGetString( const jsonObject* object, const char* field ); - - -/** - Returns the jsonObject found at the specified field in the - given object. - @param object The object to inspect - @param field The field whose value is requsted - @return The found object or NULL if none exists. Do NOT free the - returned object. - */ -const jsonObject* oilsFMGetObject( const jsonObject* object, const char* field ); - -/** - Sets the given field in the given object to the given string - @param object The object to update - @param field The field to change - @param string The new data - @return 0 if the field was updated successfully, -1 on error - */ -int oilsFMSetString( jsonObject* object, const char* field, const char* string ); - -/** - * Returns the data stored in the id field of the object if it exists - * returns -1 if the id field or the id value is not found - */ -long oilsFMGetObjectId( const jsonObject* obj ); - - -/** - * Checks if the user has each permission at the given org unit - * Passing in a -1 for the orgid means to use the top level org unit - * The first permission that fails causes the corresponding permission - * failure event to be returned - * returns NULL if all permissions succeed - */ -oilsEvent* oilsUtilsCheckPerms( int userid, int orgid, char* permissions[], int size ); - - -/** - * Performs a single request and returns the resulting data - * Caller is responsible for freeing the returned response object - */ -jsonObject* oilsUtilsQuickReq( const char* service, const char* method, - const jsonObject* params ); - -jsonObject* oilsUtilsStorageReq( const char* method, const jsonObject* params ); - -jsonObject* oilsUtilsCStoreReq( const char* method, const jsonObject* params ); - -/** - * Searches the storage server for a user with the given username - * Caller is responsible for freeing the returned object - */ -jsonObject* oilsUtilsFetchUserByUsername( const char* name ); - - -/** - * Returns the setting value - * Caller must free the returned string - */ -char* oilsUtilsFetchOrgSetting( int orgid, const char* setting ); - - -/** - * Logs into the auth server with the given username and password - * @return The authtoken string which must be de-allocated by the caller - */ -char* oilsUtilsLogin( const char* uname, const char* passwd, const char* type, int orgId ); - - -/** - * Fetches the requested workstation object by id - */ -jsonObject* oilsUtilsFetchWorkstation( long id ); - -jsonObject* oilsUtilsFetchUserByBarcode(const char* barcode); - -jsonObject* oilsUtilsFetchWorkstationByName( const char* name ); - - -int oilsUtilsIsDBTrue( const char* val ); diff --git a/Open-ILS/src/extras/Makefile b/Open-ILS/src/extras/Makefile index aa4d3c791c..40ae124324 100644 --- a/Open-ILS/src/extras/Makefile +++ b/Open-ILS/src/extras/Makefile @@ -1,4 +1,5 @@ -LDLIBS += -lreadline -loils_utils -lopensrf -lobjson -lxml2 -loils_idl +LDLIBS += -lreadline -loils_utils -lopensrf -lobjson -lxml2 -loils_idl -L../c-apps +CFLAGS += -I../../include all: oils_requestor oils_requestor: oils_requestor.o diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install index 365be27a47..bfc3b48a0a 100644 --- a/Open-ILS/src/extras/Makefile.install +++ b/Open-ILS/src/extras/Makefile.install @@ -28,8 +28,8 @@ # not require fetching the sources externally ... needs testing/updating in here -LIBJS=js-1.60 -LIBJS_PERL=JavaScript-SpiderMonkey-0.17 +LIBJS=js-1.7.0 +LIBJS_PERL=JavaScript-SpiderMonkey-0.19 LIBJS_URL=ftp://ftp.mozilla.org/pub/mozilla.org/js/$(LIBJS).tar.gz LIBJS_PERL_URL=ftp://mirror.datapipe.net/pub/CPAN/authors/id/T/TB/TBUSCH/$(LIBJS_PERL).tar.gz # used for installing libjs lib and header files @@ -95,8 +95,8 @@ DEBS = \ libreadline5-dev\ libtext-csv-perl\ libspreadsheet-writeexcel-perl\ - libtie-ixhash-perl - + libtie-ixhash-perl\ + python-setuptools GENTOOS = \ @@ -204,7 +204,7 @@ install_js_sm: cp js/src/*.tbl $(JS_INSTALL_PREFIX)/include/js/ cp js/src/Linux_All_DBG.OBJ/*.so $(JS_INSTALL_PREFIX)/lib/ cp js/src/Linux_All_DBG.OBJ/*.a $(JS_INSTALL_PREFIX)/lib/ - cd JavaScript-SpiderMonkey-0.17 && perl Makefile.PL -E4X && make && make test && make install + cd $(LIBJS_PERL) && perl Makefile.PL -E4X && make && make test && make install # Install libdbi and the postgres drivers diff --git a/Open-ILS/src/support-scripts/test-scripts/acq_fund.py b/Open-ILS/src/support-scripts/test-scripts/acq_fund.py index 698be95837..17f16b5a59 100644 --- a/Open-ILS/src/support-scripts/test-scripts/acq_fund.py +++ b/Open-ILS/src/support-scripts/test-scripts/acq_fund.py @@ -4,10 +4,10 @@ import oils.system, oils.utils.utils import osrf.net_obj, osrf.ses # --------------------------------------------------------------- -# Usage: python acq_fund.py +# Usage: python acq_fund_source.py # --------------------------------------------------------------- -oils.system.oilsConnect('/openils/conf/opensrf_core.xml', 'config.opensrf') +oils.system.System.connect(config_file='/openils/conf/opensrf_core.xml', config_context='config.opensrf') auth_info = oils.utils.utils.login(sys.argv[1], sys.argv[2], 'staff', sys.argv[3]) authtoken = auth_info['payload']['authtoken'] @@ -17,22 +17,22 @@ ses.connect() # not required, but faster for batches of request # XXX This loop assumes the existence of orgs with IDs 1-6 and a USD currency ids = [] for i in range(0,5): - fund = osrf.net_obj.NetworkObject.acqfund() - fund.name("test-fund-%d" % i) - fund.owner(i+1) - fund.currency_type('USD') - req = ses.request('open-ils.acq.fund.create', authtoken, fund) + fund_source = osrf.net_obj.NetworkObject.acqfs() + fund_source.name("test-fund_source-%d" % i) + fund_source.owner(i+1) + fund_source.currency_type('USD') + req = ses.request('open-ils.acq.funding_source.create', authtoken, fund_source) id = req.recv().content() - print 'created fund ' + str(id) + print 'created fund_source ' + str(id) ids.append(id) -req = ses.request('open-ils.acq.fund.org.retrieve', authtoken, 1, {"children":1}) +req = ses.request('open-ils.acq.funding_source.org.retrieve', authtoken, 1, {"children":1}) resp = req.recv().content() -for fund in resp: - print 'fetched fund ' + str(fund.name()) +for fund_source in resp: + print 'fetched fund_source ' + str(fund_source.name()) for i in ids: - req = ses.request('open-ils.acq.fund.delete', authtoken, i) + req = ses.request('open-ils.acq.funding_source.delete', authtoken, i) print 'delete returned ' + str(req.recv().content()) diff --git a/Open-ILS/web/oilsweb/oilsweb/lib/user.py b/Open-ILS/web/oilsweb/oilsweb/lib/user.py index 420131f0c4..a67093fb04 100644 --- a/Open-ILS/web/oilsweb/oilsweb/lib/user.py +++ b/Open-ILS/web/oilsweb/oilsweb/lib/user.py @@ -38,7 +38,7 @@ class User(object): evt = oils.event.Event.parse_event(self.ctx.user.value) if evt and evt.text_code == 'NO_SESSION': - # our authtoken.value has timed out. See if we can autologin + # our authtoken has timed out. See if we can autologin self.try_auto_login() if not self.ctx.authtoken.value: raise AuthException(_('No authentication token provided'))