--- trunk/pgswish.c 2005/02/19 11:39:11 10 +++ trunk/pgswish.c 2005/02/19 16:01:46 13 @@ -29,11 +29,13 @@ #define _textin(str) DirectFunctionCall1(textin, CStringGetDatum(str)) #define _textout(str) DatumGetPointer(DirectFunctionCall1(textout, PointerGetDatum(str))) +#define GET_STR(textp) DatumGetCString(DirectFunctionCall1(textout, PointerGetDatum(textp))) +#define GET_TEXT(cstrp) DatumGetTextP(DirectFunctionCall1(textin, CStringGetDatum(cstrp))) SW_HANDLE swish_handle = NULL;/* Database handle */ SW_SEARCH search = NULL; /* search handle -- holds search parameters */ -SW_RESULTS results = NULL; /* results handle -- holds list of results */ +SW_RESULTS swish_results = NULL; /* results handle -- holds list of results */ /* define PostgreSQL v1 function */ PG_FUNCTION_INFO_V1(pgswish); @@ -45,9 +47,6 @@ TupleDesc tupdesc; TupleTableSlot *slot; AttInMetadata *attinmeta; - SW_HANDLE swish_handle = NULL; /* Database handle */ - SW_SEARCH search = NULL; /* search handle -- holds search parameters */ - SW_RESULTS results = NULL; /* results handle -- holds list of results */ char *index_path; char *query; @@ -79,21 +78,18 @@ SRF_RETURN_DONE(funcctx); } - if ( SwishError( swish_handle ) ) error_or_abort( swish_handle ); + error_or_abort( swish_handle ); /* set ranking scheme. default is 0 */ SwishRankScheme( swish_handle, 0 ); - - /* Check for errors after every call */ - if ( SwishError( swish_handle ) ) - error_or_abort( swish_handle ); /* print an error or abort -- see below */ + error_or_abort( swish_handle ); elog(INFO, "pgswish: SwishQuery(%s)", query); /* Here's a short-cut to searching that creates a search object and searches at the same time */ - results = SwishQuery( swish_handle, query); - if ( SwishError( swish_handle ) ) error_or_abort( swish_handle ); + swish_results = SwishQuery( swish_handle, query); + error_or_abort( swish_handle ); /* total number of tuples to be returned */ - funcctx->max_calls = SwishHits( results ); + funcctx->max_calls = SwishHits( swish_results ); /* check if results exists */ if ( 0 == funcctx->max_calls ) @@ -118,6 +114,8 @@ funcctx->attinmeta = attinmeta; MemoryContextSwitchTo(oldcontext); + + elog(INFO, "SRF_IS_FIRSTCALL done"); } /* stuff done on every call of the function */ @@ -132,31 +130,78 @@ char **values; HeapTuple tuple; Datum result; + SW_RESULT *sw_res; /* one row from swish-e results */ + + elog(INFO, "pgswish: loop count %d", call_cntr); + + if (! swish_results) { + elog(ERROR, "pgswish: no swish-e results"); + SRF_RETURN_DONE(funcctx); + } + + elog(INFO, "pgswish: check for swish-e error"); + error_or_abort( swish_handle ); -if (0) { /* * Prepare a values array for storage in our slot. * This should be an array of C strings which will * be processed later by the type input functions. */ - values = (char **) palloc(5 * sizeof(char *)); - values[0] = _textout( SwishResultPropertyULong ( result, "swishrank" ) ); - values[1] = _textout( SwishResultPropertyStr ( result, "swishdocpath" ) ); - values[2] = _textout( SwishResultPropertyStr ( result, "swishtitle" ) ); - values[3] = _textout( SwishResultPropertyStr ( result, "swishdocsize" ) ); - values[4] = _textout( SwishResultPropertyStr ( result, "swishdbfile" ) ); + sw_res = SwishNextResult( swish_results ); + if (! sw_res) { + elog(ERROR, "pgswish: swish-e sort result list: %d rows expected %d", call_cntr, max_calls - 1); + SRF_RETURN_DONE(funcctx); + } + + elog(INFO, "Path: %s\n Rank: %lu\n Size: %lu\n Title: %s\n Index: %s\n Modified: %s\n Record #: %lu\n File #: %lu\n\n", + SwishResultPropertyStr ( sw_res, "swishdocpath" ), + SwishResultPropertyULong ( sw_res, "swishrank" ), + SwishResultPropertyULong ( sw_res, "swishdocsize" ), + SwishResultPropertyStr ( sw_res, "swishtitle"), + SwishResultPropertyStr ( sw_res, "swishdbfile" ), + SwishResultPropertyStr ( sw_res, "swishlastmodified" ), + SwishResultPropertyULong ( sw_res, "swishreccount" ), /* can figure this out in loop, of course */ + SwishResultPropertyULong ( sw_res, "swishfilenum" ) + ); + + values = (char **) palloc(4 * sizeof(char *)); + + values[0] = prop2int( sw_res, "swishrank" ); + values[1] = prop2text( sw_res, "swishdocpath" ); + values[2] = prop2text( sw_res, "swishtitle" ); + values[3] = prop2int( sw_res, "swishdocsize" ); + +/* + values[0] = (char *) palloc(16 * sizeof(char)); + snprintf(values[0], 16, "%d", 1); + values[1] = (char *) palloc(16 * sizeof(char)); + snprintf(values[1], 16, "%d", 2); + values[2] = (char *) palloc(16 * sizeof(char)); + snprintf(values[2], 16, "%d", 3); + values[3] = (char *) palloc(16 * sizeof(char)); + snprintf(values[3], 16, "%d", 4); +*/ + /* build a tuple */ tuple = BuildTupleFromCStrings(attinmeta, values); /* make the tuple into a datum */ result = TupleGetDatum(slot, tuple); -} - /* clean up (this is not really necessary) */ - + /* clean up ? */ + pfree(values[0]); + pfree(values[1]); + pfree(values[2]); + pfree(values[3]); + pfree(values); + + elog(INFO, "row: %s|%s|%s|%s",values[0],values[1],values[2],values[3]); + SRF_RETURN_NEXT(funcctx, result); } else { + elog(INFO, "loop over"); + /* free swish object and close */ Free_Search_Object( search ); SwishClose( swish_handle ); @@ -171,6 +216,60 @@ * */ +char *prop2text(SW_RESULT sw_res, char *propname) { + char *val; + char *prop; + int len; + + elog(INFO, "prop2text(%s)", propname); + + prop = SwishResultPropertyStr( sw_res, propname ); + error_or_abort( swish_handle ); + + len = strlen(prop); + elog(INFO, "prop2text(%s) = '%s' %d bytes", propname, prop, len); + + len++; + len *= sizeof(char); + + elog(INFO, "palloc(%d)", len); + + val = palloc(len); + + memset(val, 0, len); + strncpy(val, prop, len); + + elog(INFO, "val=%s", val); + + return val; +} + +char *prop2int(SW_RESULT sw_res, char *propname) { + char *val; + unsigned long prop; + int len; + + elog(INFO, "prop2int(%s)", propname); + + prop = SwishResultPropertyULong( sw_res, propname ); + error_or_abort( swish_handle ); + + elog(INFO, "prop2int(%s) = %lu", propname, prop); + + len = 128 * sizeof(char); + elog(INFO, "palloc(%d)", len); + + val = palloc(len); + memset(val, 0, len); + + snprintf(val, len, "%lu", prop); + + elog(INFO, "val=%s", val); + + return val; +} + + static void error_or_abort( SW_HANDLE swish_handle ) { if ( !SwishError( swish_handle ) ) return;