-const char actions_rcs[] = "$Id: actions.c,v 1.10 2001/09/10 10:14:34 oes Exp $";
+const char actions_rcs[] = "$Id: actions.c,v 1.13 2001/09/16 15:47:37 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/actions.c,v $
*
* Revisions :
* $Log: actions.c,v $
+ * Revision 1.13 2001/09/16 15:47:37 jongfoster
+ * First version of CGI-based edit interface. This is very much a
+ * work-in-progress, and you can't actually use it to edit anything
+ * yet. You must #define FEATURE_CGI_EDIT_ACTIONS for these changes
+ * to have any effect.
+ *
+ * Revision 1.12 2001/09/16 13:21:27 jongfoster
+ * Changes to use new list functions.
+ *
+ * Revision 1.11 2001/09/14 00:17:32 jongfoster
+ * Tidying up memory allocation. New function init_action().
+ *
* Revision 1.10 2001/09/10 10:14:34 oes
* Removing unused variable
*
#include "miscutil.h"
#include "errlog.h"
#include "loaders.h"
+#ifdef FEATURE_CGI_EDIT_ACTIONS
+#include "encode.h"
+#endif /* def FEATURE_CGI_EDIT_ACTIONS */
const char actions_h_rcs[] = ACTIONS_H_VERSION;
if (src->multi_remove_all[i])
{
/* Remove everything from dest */
- destroy_list(dest->multi_remove[i]);
- destroy_list(dest->multi_add[i]);
+ list_remove_all(dest->multi_remove[i]);
dest->multi_remove_all[i] = 1;
+
list_duplicate(dest->multi_add[i], src->multi_add[i]);
}
else if (dest->multi_remove_all[i])
*
* Remove *ALL*.
*/
- destroy_list(remove);
- destroy_list(add);
+ list_remove_all(remove);
+ list_remove_all(add);
cur_action->multi_remove_all[action->index] = 1;
}
else
unsigned mask = action->mask;
unsigned add = action->add;
char * result = strdup("");
- struct list * lst;
+ struct list_entry * lst;
/* sanity - prevents "-feature +feature" */
mask |= add;
} \
else \
{ \
- lst = action->multi_remove[__index]->next; \
+ lst = action->multi_remove[__index]->first; \
while (lst) \
{ \
result = strsav(result, " -" __name "{"); \
lst = lst->next; \
} \
} \
- lst = action->multi_add[__index]->next; \
+ lst = action->multi_add[__index]->first; \
while (lst) \
{ \
result = strsav(result, " +" __name "{"); \
}
+#ifdef FEATURE_CGI_EDIT_ACTIONS
+/*********************************************************************
+ *
+ * Function : actions_to_html
+ *
+ * Description : Converts a actionsfile entry from numeric form
+ * ("mask" and "add") to a <br>-seperated HTML string.
+ *
+ * Parameters :
+ * 1 : mask = As from struct url_actions
+ * 2 : add = As from struct url_actions
+ *
+ * Returns : A string. Caller must free it.
+ *
+ *********************************************************************/
+char * actions_to_html(struct action_spec *action)
+{
+ unsigned mask = action->mask;
+ unsigned add = action->add;
+ char * result = strdup("");
+ char * enc_str;
+ struct list_entry * lst;
+
+ /* sanity - prevents "-feature +feature" */
+ mask |= add;
+
+
+#define DEFINE_ACTION_BOOL(__name, __bit) \
+ if (!(mask & __bit)) \
+ { \
+ result = strsav(result, "\n<br>-" __name); \
+ } \
+ else if (add & __bit) \
+ { \
+ result = strsav(result, "\n<br>+" __name); \
+ }
+
+#define DEFINE_ACTION_STRING(__name, __bit, __index) \
+ if (!(mask & __bit)) \
+ { \
+ result = strsav(result, "\n<br>-" __name); \
+ } \
+ else if (add & __bit) \
+ { \
+ result = strsav(result, "\n<br>+" __name "{"); \
+ enc_str = html_encode(action->string[__index]);\
+ result = strsav(result, enc_str); \
+ freez(enc_str); \
+ result = strsav(result, "}"); \
+ }
+
+#define DEFINE_ACTION_MULTI(__name, __index) \
+ if (action->multi_remove_all[__index]) \
+ { \
+ result = strsav(result, "\n<br>-" __name "{*}"); \
+ } \
+ else \
+ { \
+ lst = action->multi_remove[__index]->first; \
+ while (lst) \
+ { \
+ result = strsav(result, "\n<br>-" __name "{");\
+ enc_str = html_encode(lst->str); \
+ result = strsav(result, enc_str); \
+ freez(enc_str); \
+ result = strsav(result, "}"); \
+ lst = lst->next; \
+ } \
+ } \
+ lst = action->multi_add[__index]->first; \
+ while (lst) \
+ { \
+ result = strsav(result, "\n<br>+" __name "{"); \
+ result = strsav(result, lst->str); \
+ result = strsav(result, "}"); \
+ lst = lst->next; \
+ }
+
+#define DEFINE_ACTION_ALIAS 0 /* No aliases for output */
+
+#include "actionlist.h"
+
+#undef DEFINE_ACTION_MULTI
+#undef DEFINE_ACTION_STRING
+#undef DEFINE_ACTION_BOOL
+#undef DEFINE_ACTION_ALIAS
+
+ /* trim leading <br> */
+ if (result && *result)
+ {
+ char * s = result;
+ result = strdup(result + 5);
+ free(s);
+ }
+
+ return result;
+}
+#endif /* def FEATURE_CGI_EDIT_ACTIONS */
+
+
/*********************************************************************
*
* Function : current_actions_to_text
{
unsigned flags = action->flags;
char * result = strdup("");
- struct list * lst;
+ struct list_entry * lst;
#define DEFINE_ACTION_BOOL(__name, __bit) \
if (flags & __bit) \
}
#define DEFINE_ACTION_MULTI(__name, __index) \
- lst = action->multi[__index]->next; \
+ lst = action->multi[__index]->first; \
if (lst == NULL) \
{ \
result = strsav(result, " -" __name); \
void init_current_action (struct current_action_spec *dest)
{
memset(dest, '\0', sizeof(*dest));
+
dest->flags = ACTION_MOST_COMPATIBLE;
}
{
if (src->multi_remove_all[i])
{
- /* Remove everything from dest */
- destroy_list(dest->multi[i]);
+ /* Remove everything from dest, then add src->multi_add */
list_duplicate(dest->multi[i], src->multi_add[i]);
}
else
return 1; /* never get here */
}
- while (read_config_line(buf, sizeof(buf), fp, fs) != NULL)
+ while (read_config_line(buf, sizeof(buf), fp) != NULL)
{
if (*buf == '{')
{