Fossil SCM

Add the "/test-builtin-files" webpage.

drh 2017-12-05 15:21 trunk
Commit cee662d96ed9c49abce31665c4fbfc866c30eeb551a819d5643dd4df3ae8dc25
Parent 09494b0207e4f2a…
2 files changed +17 +3 -17
~ src/builtin.c ~ src/style.c
M src/builtin.c
+17
--- src/builtin.c
+++ src/builtin.c
@@ -64,10 +64,27 @@
6464
 int i;
6565
 for(i=0; i<count(aBuiltinFiles); i++){
6666
 fossil_print("%-30s %6d\n", aBuiltinFiles[i].zName,aBuiltinFiles[i].nByte);
6767
 }
6868
 }
69
+
70
+/*
71
+** WEBPAGE: test-builtin-files
72
+**
73
+** Show all built-in text files.
74
+*/
75
+void test_builtin_list_page(void){
76
+ int i;
77
+ style_header("Built-in Text Files");
78
+ @ <ul>
79
+ for(i=0; i<count(aBuiltinFiles); i++){
80
+ const char *z = aBuiltinFiles[i].zName;
81
+ @ <li>%z(href("%R/builtin?name=%T&id=%S",z,MANIFEST_UUID))%h(z)</a>
82
+ }
83
+ @ </ul>
84
+ style_footer();
85
+}
6986
7087
 /*
7188
 ** COMMAND: test-builtin-get
7289
 **
7390
 ** Usage: %fossil test-builtin-get NAME ?OUTPUT-FILE?
7491
--- src/builtin.c
+++ src/builtin.c
@@ -64,10 +64,27 @@
64 int i;
65 for(i=0; i<count(aBuiltinFiles); i++){
66 fossil_print("%-30s %6d\n", aBuiltinFiles[i].zName,aBuiltinFiles[i].nByte);
67 }
68 }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
69
70 /*
71 ** COMMAND: test-builtin-get
72 **
73 ** Usage: %fossil test-builtin-get NAME ?OUTPUT-FILE?
74
--- src/builtin.c
+++ src/builtin.c
@@ -64,10 +64,27 @@
64 int i;
65 for(i=0; i<count(aBuiltinFiles); i++){
66 fossil_print("%-30s %6d\n", aBuiltinFiles[i].zName,aBuiltinFiles[i].nByte);
67 }
68 }
69
70 /*
71 ** WEBPAGE: test-builtin-files
72 **
73 ** Show all built-in text files.
74 */
75 void test_builtin_list_page(void){
76 int i;
77 style_header("Built-in Text Files");
78 @ <ul>
79 for(i=0; i<count(aBuiltinFiles); i++){
80 const char *z = aBuiltinFiles[i].zName;
81 @ <li>%z(href("%R/builtin?name=%T&id=%S",z,MANIFEST_UUID))%h(z)</a>
82 }
83 @ </ul>
84 style_footer();
85 }
86
87 /*
88 ** COMMAND: test-builtin-get
89 **
90 ** Usage: %fossil test-builtin-get NAME ?OUTPUT-FILE?
91
M src/style.c
+3 -17
--- src/style.c
+++ src/style.c
@@ -517,11 +517,11 @@
517517
518518
 /*
519519
 ** Generate code to load a single javascript file
520520
 */
521521
 static void style_load_one_js_file(const char *zFile){
522
- @ <script src='%R/builtin/%s(zFile)/%S(MANIFEST_UUID)'></script>
522
+ @ <script src='%R/builtin/%s(zFile)?id=%S(MANIFEST_UUID)'></script>
523523
 }
524524
525525
 /*
526526
 ** Generate code to load all required javascript files.
527527
 */
@@ -852,34 +852,20 @@
852852
 g.isConst = 1;
853853
 }
854854
855855
 /*
856856
 ** WEBPAGE: builtin
857
-** URL: builtin/FILENAME/VERSION
857
+** URL: builtin/FILENAME
858858
 **
859859
 ** Return the built-in text given by FILENAME. This is used internally
860860
 ** by many Fossil web pages to load built-in javascript files.
861
-**
862
-** The VERSION string at the end is ignored. Fossil web pages will
863
-** typically put the current Fossil check-in hash as VERSION, to cause
864
-** javascript files to be reloaded rather than sourcing a stale javascript
865
-** file from cache.
866861
 */
867862
 void page_builtin_text(void){
868863
 Blob out;
869864
 const char *zName = P("name");
870865
 const char *zTxt = 0;
871
- if( zName ){
872
- int i;
873
- for(i=0; zName[i]; i++){
874
- if( zName[i]=='/' ){
875
- zName = mprintf("%.*s", i, zName);
876
- break;
877
- }
878
- }
879
- zTxt = builtin_text(zName);
880
- }
866
+ if( zName ) zTxt = builtin_text(zName);
881867
 if( zTxt==0 ){
882868
 cgi_set_status(404, "Not Found");
883869
 @ File \"%h(zName)\" not found
884870
 return;
885871
 }
886872
--- src/style.c
+++ src/style.c
@@ -517,11 +517,11 @@
517
518 /*
519 ** Generate code to load a single javascript file
520 */
521 static void style_load_one_js_file(const char *zFile){
522 @ <script src='%R/builtin/%s(zFile)/%S(MANIFEST_UUID)'></script>
523 }
524
525 /*
526 ** Generate code to load all required javascript files.
527 */
@@ -852,34 +852,20 @@
852 g.isConst = 1;
853 }
854
855 /*
856 ** WEBPAGE: builtin
857 ** URL: builtin/FILENAME/VERSION
858 **
859 ** Return the built-in text given by FILENAME. This is used internally
860 ** by many Fossil web pages to load built-in javascript files.
861 **
862 ** The VERSION string at the end is ignored. Fossil web pages will
863 ** typically put the current Fossil check-in hash as VERSION, to cause
864 ** javascript files to be reloaded rather than sourcing a stale javascript
865 ** file from cache.
866 */
867 void page_builtin_text(void){
868 Blob out;
869 const char *zName = P("name");
870 const char *zTxt = 0;
871 if( zName ){
872 int i;
873 for(i=0; zName[i]; i++){
874 if( zName[i]=='/' ){
875 zName = mprintf("%.*s", i, zName);
876 break;
877 }
878 }
879 zTxt = builtin_text(zName);
880 }
881 if( zTxt==0 ){
882 cgi_set_status(404, "Not Found");
883 @ File \"%h(zName)\" not found
884 return;
885 }
886
--- src/style.c
+++ src/style.c
@@ -517,11 +517,11 @@
517
518 /*
519 ** Generate code to load a single javascript file
520 */
521 static void style_load_one_js_file(const char *zFile){
522 @ <script src='%R/builtin/%s(zFile)?id=%S(MANIFEST_UUID)'></script>
523 }
524
525 /*
526 ** Generate code to load all required javascript files.
527 */
@@ -852,34 +852,20 @@
852 g.isConst = 1;
853 }
854
855 /*
856 ** WEBPAGE: builtin
857 ** URL: builtin/FILENAME
858 **
859 ** Return the built-in text given by FILENAME. This is used internally
860 ** by many Fossil web pages to load built-in javascript files.
 
 
 
 
 
861 */
862 void page_builtin_text(void){
863 Blob out;
864 const char *zName = P("name");
865 const char *zTxt = 0;
866 if( zName ) zTxt = builtin_text(zName);
 
 
 
 
 
 
 
 
 
867 if( zTxt==0 ){
868 cgi_set_status(404, "Not Found");
869 @ File \"%h(zName)\" not found
870 return;
871 }
872

Keyboard Shortcuts

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