2 Commits

Author SHA1 Message Date
2136ba3f69 Update to v2.1.4:
New: Allow for comma separated list of references in aux_cmd.
2019-11-13 11:22:41 -05:00
9eafbe43eb Update to v2.1.3:
Fixed: entries that contain a '%' do not cause a failure.

  New: access 'bibtex' entry in sqlite databases
2019-11-05 18:40:15 -05:00
7 changed files with 112 additions and 82 deletions

View File

@ -1,3 +1,15 @@
2.1.4:
* New: Allow for comma separated list of references in aux_cmd.
2.1.3:
* Fixed: entries that contain a '%' do not cause a failure.
* New: access 'bibtex' entry in sqlite databases
2.1.2:
* Fixed: 'extra' entries would override database entries if they shared the

View File

@ -1,4 +1,4 @@
## Copyright Ian Jauslin 2015-2018
## Copyright Ian Jauslin 2015-2019
##
## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License.

2
NOTICE
View File

@ -1,2 +1,2 @@
BBlog
Copyright Ian Jauslin 2015-2018
Copyright Ian Jauslin 2015-2019

View File

@ -1,6 +1,6 @@
#!/bin/bash
## Copyright Ian Jauslin 2015-2018
## Copyright Ian Jauslin 2015-2019
##
## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License.
@ -15,10 +15,10 @@
## limitations under the License.
# directory containing the engine files
enginedir=
enginedir=/usr/share/BBlog/engines
# version
version=2.1.2
version=2.1.4
function print_config {
echo "engine: $engine"
@ -228,9 +228,16 @@ function replace_format {
replacement=$(eval "echo \$$field")
fi
# escape '%' in replacement
replacement="${replacement//\%/::iansays:percent::}"
out="${out//\%$command\%/$replacement}"
done
# un-escape '%' in replacement
out="${out//::iansays:percent::/\%}"
# finish replacing newlines
out="${out//\\n/%}"
out=$(echo "$out" | tr "%" "\n")
@ -265,9 +272,11 @@ function inverse_map_citeref {
foundref=0
# sift through aux file
grep -h "$aux_cmd" $aux | while read -r ref; do
eval "ref=\${ref#$aux_cmd}"
ref="${ref%\}}"
grep -h "$aux_cmd" $aux | while read -r refs; do
eval "refs=\${refs#$aux_cmd}"
refs="${ref%\}}"
# can be a comma separated list
for ref in $(echo -n "$refs" | tr ',' '\n'); do
# replace the ref via the ref_map
possibleref=$(map_citeref "$ref")
# check whether the ref is the right one
@ -276,6 +285,7 @@ function inverse_map_citeref {
foundref=1
return 1
fi
done
done && echo "$foundref$newref"
}

View File

@ -1,5 +1,5 @@
base_SQL="SELECT title,author,journal,year,token,doi,arxiv,citeref,prauth FROM bibliography"
base_SQL_noprauth="SELECT title,author,journal,year,token,doi,arxiv,citeref FROM bibliography"
base_SQL="SELECT title,author,journal,year,token,doi,arxiv,citeref,prauth,bibtex FROM bibliography"
base_SQL_noprauth="SELECT title,author,journal,year,token,doi,arxiv,citeref,bibtex FROM bibliography"
# add quotes
function SQL_addquotes {
@ -23,9 +23,12 @@ function generate_SQL_alpha {
exists_citeref=0
# sift through aux file
grep -h "$aux_cmd" $aux | while read -r citeref; do
eval "citeref=\${citeref#$aux_cmd}"
citeref="${citeref%\}}"
grep -h "$aux_cmd" $aux | while read -r citerefs; do
eval "citerefs=\${citerefs#$aux_cmd}"
citerefs="${citerefs%\}}"
# can be a comma separated list
for citeref in $(echo -n "$citerefs" | tr ',' '\n'); do
# replace the citeref with a ref_map if there is any
if [ -n "$ref_map" ]; then
@ -50,6 +53,7 @@ function generate_SQL_alpha {
exists_citeref=1
fi
done
done
# if there are no citerefs close '
[ $exists_citeref = 0 ] && echo -n "'"
@ -70,9 +74,12 @@ function fetch_BBlog_entries_appearance {
citeref_list=""
# sift through aux file
grep -h "$aux_cmd" $aux | while read -r citeref; do
eval "citeref=\${citeref#$aux_cmd}"
citeref="${citeref%\}}"
grep -h "$aux_cmd" $aux | while read -r citerefs; do
eval "citerefs=\${citerefs#$aux_cmd}"
citerefs="${citerefs%\}}"
# can be a comma separated list
for citeref in $(echo -n "$citerefs" | tr ',' '\n'); do
# replace the citeref with a ref_map if there is any
if [ -n "$ref_map" ]; then
@ -111,5 +118,6 @@ function fetch_BBlog_entries_appearance {
echo ""
fi
done
done
}

View File

@ -1,5 +1,5 @@
.Dd $Mdocdate: June 29 2018 $
.Dt BBLOG 2.1.2
.Dd $Mdocdate: November 13 2019 $
.Dt BBLOG 2.1.4
.Os
.Sh NAME
.Nm BBlog
@ -194,6 +194,6 @@ automatically adds a letter (from 'b' to 'z') at the end of non-unique tokens, i
.Nm
was written by Ian Jauslin.
.Sh COPYRIGHT
copyright Ian Jauslin 2015-2018
copyright Ian Jauslin 2015-2019
.Sh SEE ALSO
.Sx BBlog-sqlite Ns (7)

View File

@ -1,4 +1,4 @@
.Dd $Mdocdate: June 29 2018 $
.Dd $Mdocdate: Novermber 5 2019 $
.Dt BBLOG-sqlite
.Os
.Sh DESCRIPTION
@ -32,7 +32,7 @@ label of the reference
.Sh AUTHORS
The sqlite BBlog engine was written by Ian Jauslin.
.Sh COPYRIGHT
copyright Ian Jauslin 2015-2018
copyright Ian Jauslin 2015-2019
.Sh SEE ALSO
.Sx BBlog Ns (1) ,
.Sx sqlite3 Ns (1)