[ekg2-commit] ekg2: drafts.c (HEAD) jogger.c (HEAD) [peres]

[CVS commit]

Module name:	ekg2
Changes by:	peres	2007-05-06 17:53:57

Modified files:
	drafts.c jogger.c

Log message:
Check entry level correctness.

Index: drafts.c
===================================================================
RCS file: /home/cvs/ekg2/plugins/jogger/drafts.c,v
diff -d -u -r1.9 -r1.10
--- drafts.c	6 May 2007 15:28:30 -0000	1.9
+++ drafts.c	6 May 2007 15:53:57 -0000	1.10
@@ -40,7 +40,7 @@
 	/* 10 char-long don't use ':', because they're already on limit (longer ones are discarded) */
 const char *utf_jogger_header_keys[JOGGER_KEYS_MAX] = {
 	"tytul:",	"temat:",	"subject:",	"tytuł:",		NULL,
-	"poziom:",	"level:",						NULL,
+	"poziom:",	"level:",						NULL, /* 2 */
 	"tag:",									NULL, /* 3 */
 	"kategoria:",	"category:",	"kategorie:",	"categories",		NULL, /* 4 */
 	"trackback:",								NULL, /* 5 */
@@ -234,7 +234,12 @@
 
 			if (!p || !*p)
 				WARN_PRINT("jogger_warning_wrong_key");
-			else if (i == 3 || i == 4) {
+			else if (i == 2) {
+				char *lastn;
+				
+				if (strtol(sep+1, &lastn, 10) == 0 && lastn == sep+1)
+					WARN_PRINT("jogger_warning_wrong_value_level");
+			} else if (i == 3 || i == 4) {
 				const char *firstcomma	= xstrchr(sep+1, ',');
 				const char *firstspace	= xstrchr(sep+1, ' ');
 

Index: jogger.c
===================================================================
RCS file: /home/cvs/ekg2/plugins/jogger/jogger.c,v
diff -d -u -r1.20 -r1.21
--- jogger.c	6 May 2007 15:28:31 -0000	1.20
+++ jogger.c	6 May 2007 15:53:57 -0000	1.21
@@ -245,6 +245,7 @@
 	format_add("jogger_warning_malformed_url", _("%> %|* Malformed URL found at: %c%1%n"), 1);
 	format_add("jogger_warning_spacesep", _("%> %|* Possibility of accidentially using space as a separator instead of commas: %c%1%n"), 1);
 	format_add("jogger_warning_wrong_value", _("%> %|* Incorrect value found at: %c%1%n"), 1);
+	format_add("jogger_warning_wrong_value_level", _("%> %|* Wrong %Tlevel%n found (level %Tnumber%n should be used), entry would be published on %Tzeroth%n level (not default) at: %c%1%n"), 1);
 	format_add("jogger_warning_wrong_value_spaces", _("%> %|* Incorrent value found (try to remove leading&trailing spaces) at: %c%1%n"), 1);
 	format_add("jogger_warning_wrong_value_empty", _("%> %|* Empty value found in header at: %c%1%n"), 1);
 	format_add("jogger_warning_duplicated_header", _("%> %|* Duplicated header found at: %c%1%n"), 1);