software/BBlog
1
Fork 0
Code Issues Pull Requests Releases Activity

Update to v2.1.2:

Browse Source 
Fixed: 'extra' entries would override database entries if they shared the
         same token
This commit is contained in:
Ian Jauslin 2018-06-29 16:39:15 +00:00
parent 2bff6d06da
commit 4a8e51c3c9
7 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog Normal file
View File

@ -0,0 +1,5 @@
2.1.2:
* Fixed: 'extra' entries would override database entries if they shared the
same token

2
Makefile
View File

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

2
NOTICE
View File

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

7
bin/BBlog
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
## Copyright Ian Jauslin 2015-2017 ## Copyright Ian Jauslin 2015-2018
## ##
## Licensed under the Apache License, Version 2.0 (the "License"); ## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License. ## you may not use this file except in compliance with the License.
@ -15,11 +15,10 @@
## limitations under the License. ## limitations under the License.
# directory containing the engine files # directory containing the engine files
enginedir=/usr/share/BBlog/engines enginedir=
enginedir=/home/ian/Programs/BBlog2/engines
# version # version
version=2.1 version=2.1.2
function print_config { function print_config {
echo "engine: $engine" echo "engine: $engine"

2
engines/sqlite.sh
View File

@ -36,7 +36,7 @@ function generate_SQL_alpha {
foundit=0 foundit=0
if [ ${#extra} -gt 0 ]; then if [ ${#extra} -gt 0 ]; then
for entry in "${extra[@]}"; do for entry in "${extra[@]}"; do
ref="${entry#*:*:}" ref="${entry#*:}"
ref="${ref%%:*}" ref="${ref%%:*}"
if [ "$ref" = "$citeref" ]; then if [ "$ref" = "$citeref" ]; then
foundit=1 foundit=1

6
man/man1/BBlog.1
View File

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

4
man/man7/BBlog-sqlite.7
View File

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