@@ -14,10 +14,9 @@ <entry> <id>{=id=}</id> <title>{=title=}</title> - <link href="http://timothyilve.net/clog/{=id=}.atom" /> - <link rel="alternate" href="http://timothylive.net/clog/{=id=}" /> + <link href="http://timothylive.net/clog/{=id=}" /> <link rel="edit" href="http://timothylive.net/clog/edit/{=id=}.atom" /> - <updated>{=c_time=}</updated> + <updated>{=c_time %Y-%m-%dT%H:%M:%SZ=}</updated> <content type="html"><![CDATA[{=content=}]]></content> </entry> {=loop_end=} atom.ct @@ -95,6 +95,7 @@ int print_template(const char *template_file, hash_table h[], int count) { char *open; char *close; char *loop_str; + char *param; loop_str = (char *)malloc(sizeof(char) * 1); loop_str[0] = 0; @@ -131,7 +132,18 @@ int print_template(const char *template_file, hash_table h[], int count) { key = (char *)malloc(sizeof(char) * (key_size + 1)); strncpy(key, open, key_size); key[key_size] = 0; - hash_print(h[i], key); + //if key contains a space that means we have a parameter! + param = key; + while (*param) { + param++; + if (*param == ' ') { + *param = 0; + param++; + break; + } + } + + hash_print(h[i], key, param); free(key); } printf("%c", *pt); @@ -246,11 +258,6 @@ int generate_entries(int window, int id, const char *template_file) { return 0; } -void print_comment_count(char *count) { - if(strcmp(count, "0") != 0) { - printf(" (%s)", count); - } -} int free_entries(entry_t entries[], int count) { int i; @@ -318,7 +325,7 @@ int generate_comments(int entry_id, const char *template_file) { return 0; } -void htmlize_print(char *str) { +void htmlize_print(char *str, const char *param) { char *sep = "\n\r"; char *paragraph; @@ -370,12 +377,22 @@ int error_log(const char *fmt, ...) { return (ret); } -void print_date(char *time) { +void print_comment_count(char *count, const char *param) { + if(strcmp(count, "0") != 0) { + printf(" (%s)", count); + } +} + +void print_date(char *time, const char *format) { if (time != NULL) { char date[50]; //const char *format = "%a, %d %b %Y %H:%M:%S %z"; - const char *format = "%Y-%m-%dT%H:%M:%SZ"; - format_date(date, strtol(time, NULL, 10), format); + //const char *format = "%Y-%m-%dT%H:%M:%SZ"; + if (strlen(format) == 0) { + format_date(date, strtol(time, NULL, 10), "%a, %d %b %Y %H:%M:%S %z"); + } else { + format_date(date, strtol(time, NULL, 10), format); + } printf("%s", date); } } clog.c @@ -71,9 +71,9 @@ int remove_entry(int); /* * prints str where two or more \n are converted to <p> */ -void htmlize_print(char *str); -void print_comment_count(char *count); -void print_date(char *time); +void htmlize_print(char *str, const char *format); +void print_comment_count(char *count, const char *format); +void print_date(char *time, const char *format); int error_log(const char *fmt, ...); clog.h @@ -57,7 +57,7 @@ void hash_add(hash_table h, char *key, char *val, printer *f) { } -void hash_print(hash_table table, char *key) { +void hash_print(hash_table table, char *key, const char *param) { hash_t *h = hash_find(table, key); if (h == NULL) { return; @@ -66,7 +66,7 @@ void hash_print(hash_table table, char *key) { printf("%s", h->val); } } else { - h->print_f(h->val); + h->print_f(h->val, param); } } @@ -79,7 +79,7 @@ void hash_print_all(hash_table table) { while (curr != NULL) { printf(" %s\t\t| %s\t\t| ", curr->key, curr->val); if (curr->print_f != NULL) { - curr->print_f(curr->val); + curr->print_f(curr->val, NULL); } printf("\n"); curr = curr->next; hash.c @@ -22,13 +22,13 @@ #define BUCKET_SIZE 10 //if you need to parse the value before printing -typedef void printer(char *); +typedef void printer(char *, const char *); typedef struct hash { char *key; char *val; printer *print_f; - struct hash *next; //for collision... + struct hash *next; //for collision } hash_t; typedef hash_t *hash_table[BUCKET_SIZE]; @@ -48,7 +48,7 @@ void hash_free(hash_table h); * you can just use sqlite3_free_table */ void hash_add(hash_table h, char *key, char *val, printer *f); -void hash_print(hash_table table, char *key); +void hash_print(hash_table table, char *key, const char *param); void hash_print_all(hash_table table); hash.h @@ -8,11 +8,17 @@ void get_param(char *q_str, char *search, char *ret, size_t n); int main() { while (FCGI_Accept() >= 0) { - char type[80] = "html"; + char type[80] = "atom"; char entry[10] = "0"; char comments[6] = "false"; + char *postdata; - if(getenv("QUERY_STRING") != NULL) { + postdata = getenv("CONTENT_LENGTH"); + if (postdata != NULL) { + } + + + if (getenv("QUERY_STRING") != NULL) { char gets[1000]; strcpy(gets, getenv("QUERY_STRING")); main.c 5128acc3c8fcbf9c2ddf37bd4acd87f5d5b8564a Timothy Kim highwind@terra.local http://github.com/highwind/clog/commit/62ff97785979ba7df61aed2b86ddde7132776b5a 62ff97785979ba7df61aed2b86ddde7132776b5a 2009-11-05T17:57:05-08:00 2009-11-05T17:57:05-08:00 printf modifiers now can have parameters, see date_print for example 3410ace296d46ac616fa5648cda97f0307070e7b Timothy Kim highwind@terra.local