Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add the "/doc" method on the server. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
7351b6346d153f984d38ece87b52c222 |
User & Date: | drh 2008-05-15 16:58:42.000 |
Context
2008-05-15
| ||
20:25 | initial ports of static .html to static /doc .wiki ... (check-in: d87ca60c user: stephan tags: trunk) | |
20:18 | Separate the new /doc method out into its own source file. ... (check-in: 5cf1206d user: drh tags: trunk) | |
16:58 | Add the "/doc" method on the server. ... (check-in: 7351b634 user: drh tags: trunk) | |
15:23 | Added 'wiki commit'. Minor stylistic cleanups. ... (check-in: cde6e7a3 user: stephan tags: trunk) | |
Changes
Changes to src/db.c.
︙ | ︙ | |||
109 110 111 112 113 114 115 116 117 118 119 120 121 122 | if( nBegin==0 ){ db_multi_exec("BEGIN"); sqlite3_commit_hook(g.db, db_verify_at_commit, 0); } nBegin++; } void db_end_transaction(int rollbackFlag){ if( rollbackFlag ) doRollback = 1; nBegin--; if( nBegin==0 ){ int i; for(i=0; doRollback==0 && i<nCommitHook; i++){ doRollback |= aHook[i].xHook(); } | > | 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 | if( nBegin==0 ){ db_multi_exec("BEGIN"); sqlite3_commit_hook(g.db, db_verify_at_commit, 0); } nBegin++; } void db_end_transaction(int rollbackFlag){ if( nBegin<=0 ) return; if( rollbackFlag ) doRollback = 1; nBegin--; if( nBegin==0 ){ int i; for(i=0; doRollback==0 && i<nCommitHook; i++){ doRollback |= aHook[i].xHook(); } |
︙ | ︙ |
Changes to src/info.c.
︙ | ︙ | |||
788 789 790 791 792 793 794 795 796 797 798 799 800 801 | @ <blockquote><pre> content_get(rid, &content); @ %h(blob_str(&content)) @ </pre></blockquote> blob_reset(&content); style_footer(); } /* ** WEBPAGE: info ** URL: info/UUID ** ** The argument is a UUID which might be a baseline or a file or ** a ticket changes or a wiki editor or something else. | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 | @ <blockquote><pre> content_get(rid, &content); @ %h(blob_str(&content)) @ </pre></blockquote> blob_reset(&content); style_footer(); } /* ** Guess the mime-type of a document based on its name. */ const char *mimetype_from_name(const char *zName){ const char *z; int i; char zSuffix[20]; static const struct { const char *zSuffix; const char *zMimetype; } aMime[] = { { "html", "text/html" }, { "htm", "text/html" }, { "wiki", "application/x-fossil-wiki" }, { "txt", "text/plain" }, { "jpg", "image/jpeg" }, { "jpeg", "image/jpeg" }, { "gif", "image/gif" }, { "png", "image/png" }, { "css", "text/css" }, }; z = zName; for(i=0; zName[i]; i++){ if( zName[i]=='.' ) z = &zName[i+1]; } i = strlen(z); if( i<sizeof(zSuffix)-1 ){ strcpy(zSuffix, z); for(i=0; zSuffix[i]; i++) zSuffix[i] = tolower(zSuffix[i]); for(i=0; i<sizeof(aMime)/sizeof(aMime[0]); i++){ if( strcmp(zSuffix, aMime[i].zSuffix)==0 ){ return aMime[i].zMimetype; } } } return "application/x-fossil-artifact"; } /* ** WEBPAGE: doc ** URL: /doc?name=BASELINE/PATH ** ** BASELINE can be either a baseline uuid prefix or magic words "tip" ** to me the most recently checked in baseline or "ckout" to mean the ** content of the local checkout, if any. PATH is the relative pathname ** of some file. This method returns the file content. ** ** If PATH matches the patterns *.wiki or *.txt then formatting content ** is added before returning the file. For all other names, the content ** is returned straight without any interpretation or processing. */ void doc_page(void){ const char *zName; /* Argument to the /doc page */ const char *zMime; /* Document MIME type */ int vid = 0; /* Artifact of baseline */ int rid = 0; /* Artifact of file */ int i; /* Loop counter */ Blob filebody; /* Content of the documentation file */ char zBaseline[UUID_SIZE+1]; /* Baseline UUID */ login_check_credentials(); if( !g.okRead ){ login_needed(); return; } zName = PD("name", "tip/index.wiki"); for(i=0; zName[i] && zName[i]!='/'; i++){} if( zName[i]==0 || i>UUID_SIZE ){ goto doc_not_found; } memcpy(zBaseline, zName, i); zBaseline[i] = 0; zName += i; while( zName[0]=='/' ){ zName++; } if( !file_is_simple_pathname(zName) ){ goto doc_not_found; } if( strcmp(zBaseline,"ckout")==0 ){ /* Read from the local checkout */ char *zFullpath; db_must_be_within_tree(); zFullpath = mprintf("%s/%s", g.zLocalRoot, zName); if( !file_isfile(zFullpath) ){ goto doc_not_found; } if( blob_read_from_file(&filebody, zFullpath)<0 ){ goto doc_not_found; } }else{ db_begin_transaction(); if( strcmp(zBaseline,"tip")==0 ){ vid = db_int(0, "SELECT objid FROM event WHERE type='ci'" " ORDER BY mtime DESC LIMIT 1"); }else{ vid = name_to_rid(zBaseline); } /* Create the baseline cache if it does not already exist */ db_multi_exec( "CREATE TABLE IF NOT EXISTS vcache(\n" " vid INTEGER, -- baseline ID\n" " fname TEXT, -- filename\n" " rid INTEGER, -- artifact ID\n" " UNIQUE(vid,fname,rid)\n" ")" ); /* Check to see if the documentation file artifact ID is contained ** in the baseline cache */ rid = db_int(0, "SELECT rid FROM vcache" " WHERE vid=%d AND fname=%Q", vid, zName); if( rid==0 && db_exists("SELECT 1 FROM vcache WHERE vid=%d", vid) ){ goto doc_not_found; } if( rid==0 ){ Stmt s; Blob baseline; Manifest m; /* Add the vid baseline to the cache */ if( db_int(0, "SELECT count(*) FROM vcache")>10000 ){ db_multi_exec("DELETE FROM vcache"); } if( content_get(vid, &baseline)==0 ){ goto doc_not_found; } if( manifest_parse(&m, &baseline)==0 || m.type!=CFTYPE_MANIFEST ){ goto doc_not_found; } db_prepare(&s, "INSERT INTO vcache(vid,fname,rid)" " SELECT %d, :fname, rid FROM blob" " WHERE uuid=:uuid", vid ); for(i=0; i<m.nFile; i++){ db_bind_text(&s, ":fname", m.aFile[i].zName); db_bind_text(&s, ":uuid", m.aFile[i].zUuid); db_step(&s); db_reset(&s); } db_finalize(&s); manifest_clear(&m); /* Try again to find the file */ rid = db_int(0, "SELECT rid FROM vcache" " WHERE vid=%d AND fname=%Q", vid, zName); } if( rid==0 ){ goto doc_not_found; } /* Get the file content */ if( content_get(rid, &filebody)==0 ){ goto doc_not_found; } db_end_transaction(0); } /* The file is now contained in the filebody blob. Deliver the ** file to the user */ zMime = mimetype_from_name(zName); if( strcmp(zMime, "application/x-fossil-wiki")==0 ){ style_header("Documentation"); wiki_convert(&filebody, 0, 0); style_footer(); }else if( strcmp(zMime, "text/plain")==0 ){ style_header("Documentation"); @ <blockquote><pre> @ %h(blob_str(&filebody)) @ </pre></blockquote> style_footer(); }else{ cgi_set_content_type(zMime); cgi_set_content(&filebody); } return; doc_not_found: /* Jump here when unable to locate the document */ db_end_transaction(0); style_header("Document Not Found"); @ <p>No such document: %h(PD("name","tip/index.wiki"))</p> style_footer(); return; } /* ** WEBPAGE: info ** URL: info/UUID ** ** The argument is a UUID which might be a baseline or a file or ** a ticket changes or a wiki editor or something else. |
︙ | ︙ |
Changes to src/wikiformat.c.
︙ | ︙ | |||
149 150 151 152 153 154 155 | #define MARKUP_H1 16 #define MARKUP_H2 17 #define MARKUP_H3 18 #define MARKUP_H4 19 #define MARKUP_H5 20 #define MARKUP_H6 21 #define MARKUP_HR 22 | < | > | 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 | #define MARKUP_H1 16 #define MARKUP_H2 17 #define MARKUP_H3 18 #define MARKUP_H4 19 #define MARKUP_H5 20 #define MARKUP_H6 21 #define MARKUP_HR 22 #define MARKUP_I 23 #define MARKUP_IMG 24 #define MARKUP_KBD 25 #define MARKUP_LI 26 #define MARKUP_NOBR 27 #define MARKUP_NOWIKI 28 #define MARKUP_OL 29 #define MARKUP_P 30 #define MARKUP_PRE 31 |
︙ | ︙ | |||
231 232 233 234 235 236 237 238 239 240 | { "h2", MARKUP_H2, MUTYPE_BLOCK, ATTR_ALIGN }, { "h3", MARKUP_H3, MUTYPE_BLOCK, ATTR_ALIGN }, { "h4", MARKUP_H4, MUTYPE_BLOCK, ATTR_ALIGN }, { "h5", MARKUP_H5, MUTYPE_BLOCK, ATTR_ALIGN }, { "h6", MARKUP_H6, MUTYPE_BLOCK, ATTR_ALIGN }, { "hr", MARKUP_HR, MUTYPE_SINGLE, ATTR_ALIGN|ATTR_COLOR|ATTR_SIZE|ATTR_WIDTH }, { "img", MARKUP_IMG, MUTYPE_SINGLE, ATTR_ALIGN|ATTR_ALT|ATTR_BORDER|ATTR_HEIGHT| ATTR_HSPACE|ATTR_SRC|ATTR_VSPACE|ATTR_WIDTH }, | > < | 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 | { "h2", MARKUP_H2, MUTYPE_BLOCK, ATTR_ALIGN }, { "h3", MARKUP_H3, MUTYPE_BLOCK, ATTR_ALIGN }, { "h4", MARKUP_H4, MUTYPE_BLOCK, ATTR_ALIGN }, { "h5", MARKUP_H5, MUTYPE_BLOCK, ATTR_ALIGN }, { "h6", MARKUP_H6, MUTYPE_BLOCK, ATTR_ALIGN }, { "hr", MARKUP_HR, MUTYPE_SINGLE, ATTR_ALIGN|ATTR_COLOR|ATTR_SIZE|ATTR_WIDTH }, { "i", MARKUP_I, MUTYPE_FONT, 0 }, { "img", MARKUP_IMG, MUTYPE_SINGLE, ATTR_ALIGN|ATTR_ALT|ATTR_BORDER|ATTR_HEIGHT| ATTR_HSPACE|ATTR_SRC|ATTR_VSPACE|ATTR_WIDTH }, { "kbd", MARKUP_KBD, MUTYPE_FONT, 0 }, { "li", MARKUP_LI, MUTYPE_LI, ATTR_TYPE|ATTR_VALUE }, { "nobr", MARKUP_NOBR, MUTYPE_FONT, 0 }, { "nowiki", MARKUP_NOWIKI, MUTYPE_SPECIAL, 0 }, { "ol", MARKUP_OL, MUTYPE_LIST, ATTR_START|ATTR_TYPE|ATTR_COMPACT }, |
︙ | ︙ |