about summary refs log tree commit diff stats
path: root/WWW/Library/Implementation/HTVMS_WaisProt.h
diff options
context:
space:
mode:
Diffstat (limited to 'WWW/Library/Implementation/HTVMS_WaisProt.h')
-rw-r--r--WWW/Library/Implementation/HTVMS_WaisProt.h124
1 files changed, 55 insertions, 69 deletions
diff --git a/WWW/Library/Implementation/HTVMS_WaisProt.h b/WWW/Library/Implementation/HTVMS_WaisProt.h
index 1b2329b1..1a4e83d5 100644
--- a/WWW/Library/Implementation/HTVMS_WaisProt.h
+++ b/WWW/Library/Implementation/HTVMS_WaisProt.h
@@ -29,10 +29,8 @@
 */
 
 #ifndef _H_WAIS_protocol_
-#define _H_WAIS_protocol_
 
-#include <HTUtils.h>
-#include <HTVMS_WaisUI.h>
+#define _H_WAIS_protocol_
 
 /*----------------------------------------------------------------------*/
 /* Data types / constants */
@@ -220,97 +218,88 @@ typedef struct WAISSearchResponse {
 /*----------------------------------------------------------------------*/
 /* Functions */
 
-char *
-generate_search_apdu PARAMS((char* buff,  /* buffer to hold the apdu */
-			  long *buff_len, /* number of bytes written to the buffer */
-			  char *seed_words, /* string of the seed words */
-			  char *database_name,
-			  DocObj** docobjs,
-			  long maxDocsRetrieved
-			  ));
-
-DocObj* makeDocObjUsingWholeDocument PARAMS((any* aDocID,char* type));
-DocObj* makeDocObjUsingBytes PARAMS((any* aDocID,char* type,long start,long end));
-DocObj* makeDocObjUsingLines PARAMS((any* aDocID,char* type,long start,long end));
-DocObj* makeDocObjUsingParagraphs PARAMS((any* aDocID,char* type,any* start,any* end));
-void freeDocObj PARAMS((DocObj* doc));
-
-WAISInitResponse* makeWAISInitResponse PARAMS((long chunkCode,long chunkIDLen,
+DocObj* makeDocObjUsingWholeDocument _AP((any* aDocID,char* type));
+DocObj* makeDocObjUsingBytes _AP((any* aDocID,char* type,long start,long end));
+DocObj* makeDocObjUsingLines _AP((any* aDocID,char* type,long start,long end));
+DocObj* makeDocObjUsingParagraphs _AP((any* aDocID,char* type,any* start,any* end));
+void freeDocObj _AP((DocObj* doc));
+
+WAISInitResponse* makeWAISInitResponse _AP((long chunkCode,long chunkIDLen,
 					    char* chunkMarker,char* highlightMarker,
 					    char* deHighlightMarker,char* newLineChars));
-void freeWAISInitResponse PARAMS((WAISInitResponse* init));
+void freeWAISInitResponse _AP((WAISInitResponse* init));
 
-WAISSearch* makeWAISSearch PARAMS((
+WAISSearch* makeWAISSearch _AP((
 	char* seedWords,DocObj** docs,char** textList,
 	long dateFactor,char* beginDateRange,char* endDateRange,
 	long maxDocsRetrieved));
-void freeWAISSearch PARAMS((WAISSearch* query));
+void freeWAISSearch _AP((WAISSearch* query));
 
-WAISDocumentHeader* makeWAISDocumentHeader PARAMS((
+WAISDocumentHeader* makeWAISDocumentHeader _AP((
 	any* aDocID,long versionNumber,long score,long bestMatch,long docLen,
 	long lines,char** types,char* source,char* date,char* headline,char* originCity));
-void freeWAISDocumentHeader PARAMS((WAISDocumentHeader* header));
-char* writeWAISDocumentHeader PARAMS((WAISDocumentHeader* header,char* buffer,long* len));
-char* readWAISDocumentHeader PARAMS((WAISDocumentHeader** header,char* buffer));
+void freeWAISDocumentHeader _AP((WAISDocumentHeader* header));
+char* writeWAISDocumentHeader _AP((WAISDocumentHeader* header,char* buffer,long* len));
+char* readWAISDocumentHeader _AP((WAISDocumentHeader** header,char* buffer));
 
-WAISDocumentShortHeader* makeWAISDocumentShortHeader PARAMS((
+WAISDocumentShortHeader* makeWAISDocumentShortHeader _AP((
 	any* aDocID,long versionNumber,long score,long bestMatch,long docLen,long lines));
-void freeWAISDocumentShortHeader PARAMS((WAISDocumentShortHeader* header));
-char* writeWAISDocumentShortHeader PARAMS((WAISDocumentShortHeader* header,
+void freeWAISDocumentShortHeader _AP((WAISDocumentShortHeader* header));
+char* writeWAISDocumentShortHeader _AP((WAISDocumentShortHeader* header,
                                    char* buffer,long* len));
-char* readWAISDocumentShortHeader PARAMS((WAISDocumentShortHeader** header,char* buffer));
+char* readWAISDocumentShortHeader _AP((WAISDocumentShortHeader** header,char* buffer));
 
-WAISDocumentLongHeader* makeWAISDocumentLongHeader PARAMS((
+WAISDocumentLongHeader* makeWAISDocumentLongHeader _AP((
 	any* aDocID,long versionNumber,long score,long bestMatch,long docLen,
 	long lines,char** types,char* source,char* date, char* headline,char* originCity,
 	char* stockCodes,char* companyCodes,char* industryCodes));
-void freeWAISDocumentLongHeader PARAMS((WAISDocumentLongHeader* header));
-char* writeWAISDocumentLongHeader PARAMS((WAISDocumentLongHeader* header,char* buffer,long* len));
-char* readWAISDocumentLongHeader PARAMS((WAISDocumentLongHeader** header,char* buffer));
+void freeWAISDocumentLongHeader _AP((WAISDocumentLongHeader* header));
+char* writeWAISDocumentLongHeader _AP((WAISDocumentLongHeader* header,char* buffer,long* len));
+char* readWAISDocumentLongHeader _AP((WAISDocumentLongHeader** header,char* buffer));
 
-WAISSearchResponse* makeWAISSearchResponse PARAMS((
+WAISSearchResponse* makeWAISSearchResponse _AP((
 	char* seedWordsUsed,WAISDocumentHeader** docHeaders,
 	WAISDocumentShortHeader** shortHeaders,
 	WAISDocumentLongHeader** longHeaders,
 	WAISDocumentText** text,WAISDocumentHeadlines** headlines,
 	WAISDocumentCodes** codes,
 	diagnosticRecord** diagnostics));
-void freeWAISSearchResponse PARAMS((WAISSearchResponse* response));
+void freeWAISSearchResponse _AP((WAISSearchResponse* response));
 
-WAISDocumentText* makeWAISDocumentText PARAMS((any* aDocID,long versionNumber,
+WAISDocumentText* makeWAISDocumentText _AP((any* aDocID,long versionNumber,
 				       any* documentText));
-void freeWAISDocumentText PARAMS((WAISDocumentText* docText));
-char* writeWAISDocumentText PARAMS((WAISDocumentText* docText,char* buffer,long* len));
-char* readWAISDocumentText PARAMS((WAISDocumentText** docText,char* buffer));
+void freeWAISDocumentText _AP((WAISDocumentText* docText));
+char* writeWAISDocumentText _AP((WAISDocumentText* docText,char* buffer,long* len));
+char* readWAISDocumentText _AP((WAISDocumentText** docText,char* buffer));
 
-WAISDocumentHeadlines* makeWAISDocumentHeadlines PARAMS((
+WAISDocumentHeadlines* makeWAISDocumentHeadlines _AP((
 	any* aDocID,long versionNumber,char* source,char* date,char* headline,
 	char* originCity));
-void freeWAISDocumentHeadlines PARAMS((WAISDocumentHeadlines* docHeadline));
-char* writeWAISDocumentHeadlines PARAMS((WAISDocumentHeadlines* docHeadline,char* buffer,long* len));
-char* readWAISDocumentHeadlines PARAMS((WAISDocumentHeadlines** docHeadline,char* buffer));
+void freeWAISDocumentHeadlines _AP((WAISDocumentHeadlines* docHeadline));
+char* writeWAISDocumentHeadlines _AP((WAISDocumentHeadlines* docHeadline,char* buffer,long* len));
+char* readWAISDocumentHeadlines _AP((WAISDocumentHeadlines** docHeadline,char* buffer));
 
-WAISDocumentCodes* makeWAISDocumentCodes PARAMS((
+WAISDocumentCodes* makeWAISDocumentCodes _AP((
 	any* aDocID,long versionNumber,char* stockCodes,char* companyCodes,
 	char* industryCodes));
-void freeWAISDocumentCodes PARAMS((WAISDocumentCodes* docCodes));
-char* writeWAISDocumentCodes PARAMS((WAISDocumentCodes* docCodes,char* buffer,long* len));
-char* readWAISDocumentCodes PARAMS((WAISDocumentCodes** docCodes,char* buffer));
-
-any* makeWAISTextQuery PARAMS((DocObj** docs));
-DocObj** readWAISTextQuery PARAMS((any* terms));
-
-void CSTFreeWAISInitResponse PARAMS((WAISInitResponse* init));
-void CSTFreeWAISSearch PARAMS((WAISSearch* query));
-void CSTFreeDocObj PARAMS((DocObj* doc));
-void CSTFreeWAISDocumentHeader PARAMS((WAISDocumentHeader* header));
-void CSTFreeWAISDocumentShortHeader PARAMS((WAISDocumentShortHeader* header));
-void CSTFreeWAISDocumentLongHeader PARAMS((WAISDocumentLongHeader* header));
-void CSTFreeWAISSearchResponse PARAMS((WAISSearchResponse* response));
-void CSTFreeWAISDocumentText PARAMS((WAISDocumentText* docText));
-void CSTFreeWAISDocHeadlines PARAMS((WAISDocumentHeadlines* docHeadline));
-void CSTFreeWAISDocumentCodes PARAMS((WAISDocumentCodes* docCodes));
-void CSTFreeWAISTextQuery PARAMS(( any* query));
+void freeWAISDocumentCodes _AP((WAISDocumentCodes* docCodes));
+char* writeWAISDocumentCodes _AP((WAISDocumentCodes* docCodes,char* buffer,long* len));
+char* readWAISDocumentCodes _AP((WAISDocumentCodes** docCodes,char* buffer));
+
+any* makeWAISTextQuery _AP((DocObj** docs));
+DocObj** readWAISTextQuery _AP((any* terms));
+
+void CSTFreeWAISInitResponse _AP((WAISInitResponse* init));
+void CSTFreeWAISSearch _AP((WAISSearch* query));
+void CSTFreeDocObj _AP((DocObj* doc));
+void CSTFreeWAISDocumentHeader _AP((WAISDocumentHeader* header));
+void CSTFreeWAISDocumentShortHeader _AP((WAISDocumentShortHeader* header));
+void CSTFreeWAISDocumentLongHeader _AP((WAISDocumentLongHeader* header));
+void CSTFreeWAISSearchResponse _AP((WAISSearchResponse* response));
+void CSTFreeWAISDocumentText _AP((WAISDocumentText* docText));
+void CSTFreeWAISDocHeadlines _AP((WAISDocumentHeadlines* docHeadline));
+void CSTFreeWAISDocumentCodes _AP((WAISDocumentCodes* docCodes));
+void CSTFreeWAISTextQuery _AP(( any* query));
 
 /*----------------------------------------------------------------------*/
 
@@ -345,9 +334,6 @@ void CSTFreeWAISTextQuery PARAMS(( any* query));
 #ifndef WMESSAGE_H
 #define WMESSAGE_H
 
-#include <HTUtils.h>
-#include <HTVMS_WaisUI.h>
-
 typedef struct wais_header {
         char    msg_len[10];    /* length in bytes of following message */
         char    msg_type;       /* type of message: 'z'=Z39.50 APDU,
@@ -381,9 +367,9 @@ typedef struct wais_header {
 #define UUENCODE		'u'  
 
 
-void readWAISPacketHeader PARAMS((char* msgBuffer,WAISMessage *header_struct));
-long getWAISPacketLength PARAMS((WAISMessage* header));
-void writeWAISPacketHeader PARAMS((char* header,long dataLen,long type,
+void readWAISPacketHeader _AP((char* msgBuffer,WAISMessage *header_struct));
+long getWAISPacketLength _AP((WAISMessage* header));
+void writeWAISPacketHeader _AP((char* header,long dataLen,long type,
 				char* server,long compression,	
 				long encoding,long version));