From 02236448e4d2bfe48a601e5f5309e42ff9c1b887 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 30 Aug 2009 00:05:35 -0400 Subject: sha256 for 0.71.4 --- CHANGELOG | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4f34af69..92a56752 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,9 +11,9 @@ Reverse Chronological: %% sisu_0.71.4.orig.tar.gz (2009-08-29:34/6) http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.4.orig.tar.gz - sisu_0.71.4.orig.tar.gz - sisu_0.71.4-1.dsc - sisu_0.71.4-1.diff.gz + a9accd67316fcc21fa289dd3923641b182023ee3e038ee7c3324b6e71b129a68 1551081 sisu_0.71.4.orig.tar.gz + 1014c3807a2ba159682b8f52c2b287a7858bd83acf4ffa041d99f759dcebd310 1151 sisu_0.71.4-1.dsc + c3566cb294440482526bc10f3bee45ff5eeae7ed6ec39178f1fd3785c6b3d1dd 151444 sisu_0.71.4-1.diff.gz * sql, fix, different solutions for postgresql and sqlite to populate database using ruby-dbi -- cgit v1.2.3 From 0f69b7cdc97385972c13560c03bbb0ecaf147457 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 31 Aug 2009 23:32:34 -0400 Subject: cgi search, cosmetic --- conf/sisu/version1.yml | 6 +++--- lib/sisu/v1/cgi_sql_common.rb | 13 +++++++------ lib/sisu/v1/sysenv.rb | 22 +++++++++------------- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/conf/sisu/version1.yml b/conf/sisu/version1.yml index b310f05a..b3d4e7d5 100644 --- a/conf/sisu/version1.yml +++ b/conf/sisu/version1.yml @@ -1,5 +1,5 @@ --- -:version: 0.71.4 -:date_stamp: 2009w34/6 -:date: "2009-08-29" +:version: 0.71.5 +:date_stamp: 2009w35/1 +:date: "2009-08-31" :project: SiSU diff --git a/lib/sisu/v1/cgi_sql_common.rb b/lib/sisu/v1/cgi_sql_common.rb index fea17a7a..bd0b38a5 100644 --- a/lib/sisu/v1/cgi_sql_common.rb +++ b/lib/sisu/v1/cgi_sql_common.rb @@ -123,8 +123,6 @@ module SiSU_CGI_sql * Ralph Amissah - - ** Description: html generation, processing WOK_SQL end def header1 @@ -288,6 +286,7 @@ module SiSU_CGI_sql @date_available=q['dta'] if q['dta']=~/\S/ @date_valid=q['dtv'] if q['dtv']=~/\S/ @filename=q['fns'] if q['fns']=~/\S/ + @filename=q['doc'] if q['search'] !~/search db/ @@limit=q['ltd'] if q['ltd']=~/\d+/ # 1000 @@offset=q['off'] if q['off']=~/\d+/ # 0 end @@ -818,7 +817,8 @@ module SiSU_CGI_sql else title='' end if @text_search_flag - if cgi['view']=~/text/ #% txt body + if cgi['view']=~/text/ \ + or (cgi['view']!~/index/ and cgi['search'] !~/search db/) #% txt body text=if c['suffix'] !~/1/ #seg if @search_for.text1 =~/\S+/ \ or q['s1'] =~/\S+/ #% only this branch is working !! @@ -855,7 +855,7 @@ module SiSU_CGI_sql output=if c['seg'] =~/\S+/; title+text else text end - elsif cgi['view']=~/index/ #% idx body + else #elsif cgi['view']=~/index/ #% idx body if c['suffix'] !~/1/ #seg index=%{#{c['ocn']}, } if @text_search_flag elsif c['suffix'] =~/1/ #doc @@ -916,14 +916,15 @@ module SiSU_CGI_sql oldtid=e['metadata_tid'].to_i else title = '' end - if cgi['view']=~/text/ #% txt endnotes + if cgi['view']=~/text/ \ + or (cgi['view']!~/index/ and cgi['search'] !~/search db/) #% txt endnotes @counter_endn_ocn+=1 matched_endnote=if (@search_regx.to_s.class==String && @search_regx.to_s=~/\S\S+/) matched=e['body'].gsub(/(<\s]+#{@search_regx}[^>]+?>|#@search_regx)/mi,%{\\1}) else e['body'] end output=%{#{title}
note #{e['nr']} referred to from ocn #{e['ocn']}: #{matched_endnote}} - elsif cgi['view']=~/index/ #% idx endnotes + else #elsif cgi['view']=~/index/ #% idx endnotes @counter_endn_ocn+=1 output=%{#{title}#{e['nr']} [§ #{e['ocn']}], } end diff --git a/lib/sisu/v1/sysenv.rb b/lib/sisu/v1/sysenv.rb index 8b15f957..945cf07c 100644 --- a/lib/sisu/v1/sysenv.rb +++ b/lib/sisu/v1/sysenv.rb @@ -1040,10 +1040,9 @@ module SiSU_Env - idx - txt - - + + + #{table_close} @@ -1102,10 +1101,9 @@ WOK - idx - txt - - + + + @@ -1198,9 +1196,9 @@ WOK
- idx - txt - + + + } @@ -1212,8 +1210,6 @@ WOK
- idx - txt -- cgit v1.2.3 From 9866f881b1deeddbe50205a4dadac388f7e417db Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 27 Nov 2009 09:48:01 -0500 Subject: harvest_authors, minor fix --- lib/sisu/v1/harvest_authors.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/sisu/v1/harvest_authors.rb b/lib/sisu/v1/harvest_authors.rb index c7ca80fb..a75c9ce8 100644 --- a/lib/sisu/v1/harvest_authors.rb +++ b/lib/sisu/v1/harvest_authors.rb @@ -107,7 +107,6 @@ module HARVEST_authors rgx[:author]=/^@(?:author|creator):\s+(.+)/ rgx[:title]=/^@title:\s+(.+)/ rgx[:subtitle]=/^@subtitle:\s+(.+)/ - rgx[:date]=/^@subtitle:\s+(.+)/ rgx[:date]=/^@date:\s+(\d{4})/ rgx[:orig_pub]=/^@original_publication:\s+(.+)/ data.each do |para| -- cgit v1.2.3 From 3151b3be0e372c91ffed6d4c0b1fb11d80c22d36 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 27 Nov 2009 09:48:28 -0500 Subject: sisu.vim adjustments --- data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim index c7cdf2df..fd570fa7 100644 --- a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim +++ b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim @@ -63,13 +63,13 @@ syn region sisu_header_content contains=sisu_error,sisu_error_wspace,sisu_conten syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace matchgroup=sisu_structure start="^\([1-8]\|:\?[A-C]\)\~\(\S\+\|[^-]\)" end="$" "grouped text syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^table{.\+" end="}table" -syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^{\(t\|table\)\(\~h\)\?\(\sc[0-9]\+;\)\?[0-9; ]*}" end="\n\n" +syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^{\(t\|table\)\(\~h\)\?\(\sc[0-9]\+;\)\?[0-9; ]*}" end="\n$" syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^\(alt\|group\|poem\){" end="^}\(alt\|group\|poem\)" syn region sisu_content_alt contains=sisu_error matchgroup=sisu_contain start="^code{" end="^}code" "endnotes syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker matchgroup=sisu_mark_endnote start="\~{[*+]*" end="}\~" skip="\n" syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker matchgroup=sisu_mark_endnote start="\~\[[*+]*" end="\]\~" skip="\n" -syn region sisu_content_endnote contains=sisu_strikeout,sisu_number,sisu_control,sisu_link,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break matchgroup=sisu_mark_endnote start="\^\~" end="\n\n" +syn region sisu_content_endnote contains=sisu_strikeout,sisu_number,sisu_control,sisu_link,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break matchgroup=sisu_mark_endnote start="\^\~" end="\n$" "links and images syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_sem_block,sisu_error matchgroup=sisu_link start="{\(\~^\s\)\?" end="}\(https\?:/\/\|\.\./\)\S\+" oneline syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_sem_block,sisu_error matchgroup=sisu_link start="{\(\~^\s\)\?" end="\[[1-5][sS]*\]}\S\+\.ss[tm]" oneline @@ -126,8 +126,8 @@ syn match sisu_error_wspace contains=sisu_error_wspace " \s*$" syn match sisu_error contains=sisu_error_wspace "\t\+" syn match sisu_error contains=sisu_error,sisu_error_wspace "\([^ (][_\\]\||[^ (}]\)https\?:\S\+" syn match sisu_error contains=sisu_error "_\?https\?:\S\+[}><]" -syn match sisu_error contains=sisu_error "\([!*/_\+,^]\){\([^(\}\1)]\)\{-}\n\n" -syn match sisu_error contains=sisu_error "^[\~]{[^{]\{-}\n\n" +syn match sisu_error contains=sisu_error "\([!*/_\+,^]\){\([^(\}\1)]\)\{-}\n$" +syn match sisu_error contains=sisu_error "^[\~]{[^{]\{-}\n$" syn match sisu_error contains=sisu_error "\s\+.{{" syn match sisu_error contains=sisu_error "^\~\s*$" syn match sisu_error contains=sisu_error "^[0-9]\~\s*$" @@ -140,10 +140,10 @@ syn match sisu_error contains=sisu_error "[^ (\"'(\[][_/\*!]{\|}[_/\*!][a-zA-Z0- syn match sisu_error contains=sisu_error "" "errors for filetype sisu, though not error in 'metaverse': syn match sisu_error contains=sisu_error,sisu_match,sisu_strikeout,sisu_contain,sisu_content_alt,sisu_mark,sisu_break,sisu_number "<[a-zA-Z\/]\+>" -syn match sisu_error "/\?<\([biu]\)>[^()]\{-}\n\n" +syn match sisu_error "/\?<\([biu]\)>[^()]\{-}\n$" "Error Exceptions: -syn match sisu_control "\n\n" "contains=ALL +syn match sisu_control "\n$" "contains=ALL syn match sisu_control " //" syn match sisu_error "%{" syn match sisu_error "
_\?https\?:\S\+\|_\?https\?:\S\+
" -- cgit v1.2.3