Command line printer manipulation client, and build goo.

[moira.git] / server / query.h

diff --git a/server/query.h b/server/query.h
index ffb3af810c725eeb5160a9864c83464c697f5f5a..7a663def6cde24622761f188a13270466211a50e 100644 (file)
--- a/server/query.h
+++ b/server/query.h
@@ -1,25 +1,21 @@
-/* $Header$
+/* $Id$
  *
  * Structures and constants used in the query dispatch table
+ *
+ * Copyright (C) 1987-1998 by the Massachusetts Institute of Technology.
+ * For copying and distribution information, please see the file
+ * <mit-copyright.h>.
  */
 
 /* Query Types */
-enum query_type {RETRIEVE, UPDATE, APPEND, DELETE, SPECIAL};
-
-/* Tables */
-enum tables {NO_TABLE, USERS_TABLE, KRBMAP_TABLE, MACHINE_TABLE,
-            HOSTALIAS_TABLE, SUBNET_TABLE, CLUSTER_TABLE, MCMAP_TABLE,
-            SVC_TABLE, LIST_TABLE, IMEMBERS_TABLE, SERVERS_TABLE,
-            SERVERHOSTS_TABLE, FILESYS_TABLE, FSGROUP_TABLE, NFSPHYS_TABLE,
-            QUOTA_TABLE, ZEPHYR_TABLE, HOSTACCESS_TABLE, STRINGS_TABLE,
-            SERVICES_TABLE, PRINTCAP_TABLE, PALLADIUM_TABLE, CAPACLS_TABLE,
-            ALIAS_TABLE, NUMVALUES_TABLE, TBLSTATS_TABLE, INCREMENTAL_TABLE};
+enum query_type {MR_Q_RETRIEVE, MR_Q_UPDATE, MR_Q_APPEND, MR_Q_DELETE, MR_Q_SPECIAL};
 
 /* Query Definition Structure */
 struct query
 {
   char *name;                  /* query name */
   char *shortname;             /* abbreviated query name (must be 4 chars) */
+  int  version;                        /* query version */
   enum query_type type;                /* query type */
   char *rvar;                  /* range variable */
   enum tables rtable;          /* range table */
@@ -28,6 +24,7 @@ struct query
   int  vcnt;                   /* variable count */
   char *qual;                  /* format string for "where" clause */
   int  argc;                   /* number of args for qualifier */
+  char *sort;                  /* fields to sort on */
   struct validate *validate;   /* validation support */
   int  acl;                    /* hint as to query ACL for this query */
   int  everybody;              /* is the default user on this ACL? */
@@ -46,17 +43,16 @@ struct validate
   /* values field containing current max object id */
   char *object_id;
   /* routine to verify access permission on objects */
-  int (*acs_rtn)();
+  int (*acs_rtn)(struct query *q, char *Argv[], client *cl);
   /* pre-processing routine (var setup only) */
-  int (*pre_rtn)();
+  int (*pre_rtn)(struct query *q, char *Argv[], client *cl);
   /* post-processing routine */
   int (*post_rtn)();
 };
 
 /* Validated Object Types */
-enum vo_type {V_NAME, V_ID, V_TYPE, V_TYPEDATA, V_DATE,
-             V_SORT, V_RENAME, V_CHAR, V_LOCK, V_WILD, V_UPWILD,
-              V_RLOCK, V_LEN};
+enum vo_type {V_NAME, V_ID, V_TYPE, V_TYPEDATA, V_RENAME, V_CHAR,
+             V_LEN, V_NUM};
 
 /* Validated Object Definition */
 struct valobj
@@ -69,30 +65,21 @@ struct valobj
   int error;
 };
 
-
-/* prototypes from cache.dc */
-void flush_cache(void);
-int name_to_id(char *name, enum tables type, int *id);
-int id_to_name(int id, enum tables type, char **name);
-int cache_entry(char *name, enum tables type, int id);
-void flush_name(char *name, enum tables type);
-void cache_commit(void);
-void cache_abort(void);
-
 /* prototypes from increment.dc */
 void incremental_before(enum tables table, char *qualx, char **argv);
 void incremental_clear_before(void);
 void incremental_after(enum tables table, char *qualx, char **argv);
 void incremental_clear_after(void);
 
-/* prototypes from qfollow.dc */
-int set_pobox_modtime(struct query *q, char *argv[], client *cl);
-
 /* prototypes from qrtn.dc */
 int check_query_access(struct query *q, char *argv[], client *cl);
 int set_next_object_id(char *objectx, enum tables table, int limit);
+int name_to_id(char *name, enum tables type, int *id);
+int id_to_name(int id, enum tables type, char **name);
 
 /* prototypes from qsubs.c */
-void list_queries(int version, int (*action)(), char *actarg);
-void help_query(struct query *q, int (*action)(), char *actarg);
+void list_queries(client *cl, int (*action)(int, char *[], void *),
+                 void *actarg);
+void help_query(struct query *q, int (*action)(int, char *[], void *),
+               void *actarg);
 struct query *get_query_by_name(char *name, int version);