Fossil SCM

Allow boolean parameters sbs= and v= to taken values like "on", "off", "yes", and "no". Assign meaningful defaults even if the argument is omitted.

drh 2013-05-02 13:28 UTC trunk
Commit e09d84f297f30188232a03b4ebcf46f4007f317d
Parent 8d3ff5a7109a51c…
2 files changed +4 -4 +3 -3
~ src/event.c ~ src/info.c
M src/event.c
+4 -4
--- src/event.c
+++ src/event.c
@@ -109,11 +109,11 @@
109109
 zVerbose = P("verbose");
110110
 }
111111
 if( !zVerbose ){
112112
 zVerbose = P("detail"); /* deprecated */
113113
 }
114
- verboseFlag = (zVerbose!=0) && (*zVerbose!=0) && !is_false(zVerbose);
114
+ verboseFlag = (zVerbose!=0) && !is_false(zVerbose);
115115
116116
 /* Extract the event content.
117117
 */
118118
 pEvent = manifest_get(rid, CFTYPE_EVENT);
119119
 if( pEvent==0 ){
@@ -139,25 +139,25 @@
139139
 g.zTop, zEventId, zUuid);
140140
 if( nextRid ){
141141
 char *zNext;
142142
 zNext = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nextRid);
143143
 style_submenu_element("Next", "Next",
144
- "%s/event?name=%s&aid=%s&v=1",
144
+ "%s/event?name=%s&aid=%s&v",
145145
 g.zTop, zEventId, zNext);
146146
 free(zNext);
147147
 }
148148
 if( prevRid ){
149149
 char *zPrev;
150150
 zPrev = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", prevRid);
151151
 style_submenu_element("Prev", "Prev",
152
- "%s/event?name=%s&aid=%s&v=1",
152
+ "%s/event?name=%s&aid=%s&v",
153153
 g.zTop, zEventId, zPrev);
154154
 free(zPrev);
155155
 }
156156
 }else{
157157
 style_submenu_element("Detail", "Detail",
158
- "%s/event?name=%s&aid=%s&v=1",
158
+ "%s/event?name=%s&aid=%s&v",
159159
 g.zTop, zEventId, zUuid);
160160
 }
161161
 }
162162
163163
 if( verboseFlag && g.perm.Hyperlink ){
164164
--- src/event.c
+++ src/event.c
@@ -109,11 +109,11 @@
109 zVerbose = P("verbose");
110 }
111 if( !zVerbose ){
112 zVerbose = P("detail"); /* deprecated */
113 }
114 verboseFlag = (zVerbose!=0) && (*zVerbose!=0) && !is_false(zVerbose);
115
116 /* Extract the event content.
117 */
118 pEvent = manifest_get(rid, CFTYPE_EVENT);
119 if( pEvent==0 ){
@@ -139,25 +139,25 @@
139 g.zTop, zEventId, zUuid);
140 if( nextRid ){
141 char *zNext;
142 zNext = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nextRid);
143 style_submenu_element("Next", "Next",
144 "%s/event?name=%s&aid=%s&v=1",
145 g.zTop, zEventId, zNext);
146 free(zNext);
147 }
148 if( prevRid ){
149 char *zPrev;
150 zPrev = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", prevRid);
151 style_submenu_element("Prev", "Prev",
152 "%s/event?name=%s&aid=%s&v=1",
153 g.zTop, zEventId, zPrev);
154 free(zPrev);
155 }
156 }else{
157 style_submenu_element("Detail", "Detail",
158 "%s/event?name=%s&aid=%s&v=1",
159 g.zTop, zEventId, zUuid);
160 }
161 }
162
163 if( verboseFlag && g.perm.Hyperlink ){
164
--- src/event.c
+++ src/event.c
@@ -109,11 +109,11 @@
109 zVerbose = P("verbose");
110 }
111 if( !zVerbose ){
112 zVerbose = P("detail"); /* deprecated */
113 }
114 verboseFlag = (zVerbose!=0) && !is_false(zVerbose);
115
116 /* Extract the event content.
117 */
118 pEvent = manifest_get(rid, CFTYPE_EVENT);
119 if( pEvent==0 ){
@@ -139,25 +139,25 @@
139 g.zTop, zEventId, zUuid);
140 if( nextRid ){
141 char *zNext;
142 zNext = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nextRid);
143 style_submenu_element("Next", "Next",
144 "%s/event?name=%s&aid=%s&v",
145 g.zTop, zEventId, zNext);
146 free(zNext);
147 }
148 if( prevRid ){
149 char *zPrev;
150 zPrev = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", prevRid);
151 style_submenu_element("Prev", "Prev",
152 "%s/event?name=%s&aid=%s&v",
153 g.zTop, zEventId, zPrev);
154 free(zPrev);
155 }
156 }else{
157 style_submenu_element("Detail", "Detail",
158 "%s/event?name=%s&aid=%s&v",
159 g.zTop, zEventId, zUuid);
160 }
161 }
162
163 if( verboseFlag && g.perm.Hyperlink ){
164
M src/info.c
+3 -3
--- src/info.c
+++ src/info.c
@@ -484,11 +484,11 @@
484484
 " FROM blob, event"
485485
 " WHERE blob.rid=%d"
486486
 " AND event.objid=%d",
487487
 rid, rid
488488
 );
489
- sideBySide = atoi(PD("sbs","1"));
489
+ sideBySide = !is_false(PD("sbs","1"));
490490
 if( db_step(&q)==SQLITE_ROW ){
491491
 const char *zUuid = db_column_text(&q, 0);
492492
 char *zTitle = mprintf("Check-in [%.10s]", zUuid);
493493
 char *zEUser, *zEComment;
494494
 const char *zUser;
@@ -913,11 +913,11 @@
913913
 }
914914
 pTo = vdiff_parse_manifest("to", &ridTo);
915915
 if( pTo==0 ) return;
916916
 pFrom = vdiff_parse_manifest("from", &ridFrom);
917917
 if( pFrom==0 ) return;
918
- sideBySide = atoi(PD("sbs","1"));
918
+ sideBySide = !is_false(PD("sbs","1"));
919919
 zVerbose = P("v");
920920
 if( !zVerbose ){
921921
 zVerbose = P("verbose");
922922
 }
923923
 if( !zVerbose ){
@@ -1256,11 +1256,11 @@
12561256
 login_check_credentials();
12571257
 if( !g.perm.Read ){ login_needed(); return; }
12581258
 v1 = name_to_rid_www("v1");
12591259
 v2 = name_to_rid_www("v2");
12601260
 if( v1==0 || v2==0 ) fossil_redirect_home();
1261
- sideBySide = atoi(PD("sbs","1"));
1261
+ sideBySide = !is_false(PD("sbs","1"));
12621262
 zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1);
12631263
 zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2);
12641264
 isPatch = P("patch")!=0;
12651265
 if( isPatch ){
12661266
 pOut = cgi_output_blob();
12671267
--- src/info.c
+++ src/info.c
@@ -484,11 +484,11 @@
484 " FROM blob, event"
485 " WHERE blob.rid=%d"
486 " AND event.objid=%d",
487 rid, rid
488 );
489 sideBySide = atoi(PD("sbs","1"));
490 if( db_step(&q)==SQLITE_ROW ){
491 const char *zUuid = db_column_text(&q, 0);
492 char *zTitle = mprintf("Check-in [%.10s]", zUuid);
493 char *zEUser, *zEComment;
494 const char *zUser;
@@ -913,11 +913,11 @@
913 }
914 pTo = vdiff_parse_manifest("to", &ridTo);
915 if( pTo==0 ) return;
916 pFrom = vdiff_parse_manifest("from", &ridFrom);
917 if( pFrom==0 ) return;
918 sideBySide = atoi(PD("sbs","1"));
919 zVerbose = P("v");
920 if( !zVerbose ){
921 zVerbose = P("verbose");
922 }
923 if( !zVerbose ){
@@ -1256,11 +1256,11 @@
1256 login_check_credentials();
1257 if( !g.perm.Read ){ login_needed(); return; }
1258 v1 = name_to_rid_www("v1");
1259 v2 = name_to_rid_www("v2");
1260 if( v1==0 || v2==0 ) fossil_redirect_home();
1261 sideBySide = atoi(PD("sbs","1"));
1262 zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1);
1263 zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2);
1264 isPatch = P("patch")!=0;
1265 if( isPatch ){
1266 pOut = cgi_output_blob();
1267
--- src/info.c
+++ src/info.c
@@ -484,11 +484,11 @@
484 " FROM blob, event"
485 " WHERE blob.rid=%d"
486 " AND event.objid=%d",
487 rid, rid
488 );
489 sideBySide = !is_false(PD("sbs","1"));
490 if( db_step(&q)==SQLITE_ROW ){
491 const char *zUuid = db_column_text(&q, 0);
492 char *zTitle = mprintf("Check-in [%.10s]", zUuid);
493 char *zEUser, *zEComment;
494 const char *zUser;
@@ -913,11 +913,11 @@
913 }
914 pTo = vdiff_parse_manifest("to", &ridTo);
915 if( pTo==0 ) return;
916 pFrom = vdiff_parse_manifest("from", &ridFrom);
917 if( pFrom==0 ) return;
918 sideBySide = !is_false(PD("sbs","1"));
919 zVerbose = P("v");
920 if( !zVerbose ){
921 zVerbose = P("verbose");
922 }
923 if( !zVerbose ){
@@ -1256,11 +1256,11 @@
1256 login_check_credentials();
1257 if( !g.perm.Read ){ login_needed(); return; }
1258 v1 = name_to_rid_www("v1");
1259 v2 = name_to_rid_www("v2");
1260 if( v1==0 || v2==0 ) fossil_redirect_home();
1261 sideBySide = !is_false(PD("sbs","1"));
1262 zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1);
1263 zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2);
1264 isPatch = P("patch")!=0;
1265 if( isPatch ){
1266 pOut = cgi_output_blob();
1267

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button