Compare commits
	
		
			7 Commits
		
	
	
		
			v2.1.1
			...
			c2f99c259d
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| c2f99c259d | |||
| c6e9cb3af4 | |||
| 70bba87946 | |||
| aacbf51475 | |||
| 2136ba3f69 | |||
| 9eafbe43eb | |||
| 
						 | 
					4a8e51c3c9 | 
							
								
								
									
										37
									
								
								Changelog
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										37
									
								
								Changelog
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,37 @@
 | 
			
		||||
2.3:
 | 
			
		||||
 | 
			
		||||
  * New: access 'url' entry in sqlite databases.
 | 
			
		||||
 | 
			
		||||
2.2.1:
 | 
			
		||||
 | 
			
		||||
  * Fix: Missing quotes in filter interpreter.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
2.2:
 | 
			
		||||
 | 
			
		||||
  * New: Allow for the value of other entries to be in the 'sed' command of a
 | 
			
		||||
	 filter. (May break existing configurations in cases where sed command
 | 
			
		||||
	 uses a '%'.)
 | 
			
		||||
 | 
			
		||||
2.1.5:
 | 
			
		||||
 | 
			
		||||
  * Fixed: Properly escape entries with a '%'
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
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
 | 
			
		||||
           same token
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
									
									
									
									
								
							@@ -1,4 +1,4 @@
 | 
			
		||||
## Copyright Ian Jauslin 2015-2017
 | 
			
		||||
## Copyright Ian Jauslin 2015-2023
 | 
			
		||||
## 
 | 
			
		||||
## Licensed under the Apache License, Version 2.0 (the "License");
 | 
			
		||||
## you may not use this file except in compliance with the License.
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								NOTICE
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								NOTICE
									
									
									
									
									
								
							@@ -1,2 +1,2 @@
 | 
			
		||||
BBlog
 | 
			
		||||
Copyright Ian Jauslin 2015-2017
 | 
			
		||||
Copyright Ian Jauslin 2015-2023
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										25
									
								
								bin/BBlog
									
									
									
									
									
								
							
							
						
						
									
										25
									
								
								bin/BBlog
									
									
									
									
									
								
							@@ -1,6 +1,6 @@
 | 
			
		||||
#!/bin/bash
 | 
			
		||||
 | 
			
		||||
## Copyright Ian Jauslin 2015-2017
 | 
			
		||||
## Copyright Ian Jauslin 2015-2023
 | 
			
		||||
## 
 | 
			
		||||
## Licensed under the Apache License, Version 2.0 (the "License");
 | 
			
		||||
## you may not use this file except in compliance with the License.
 | 
			
		||||
@@ -16,10 +16,9 @@
 | 
			
		||||
 | 
			
		||||
# directory containing the engine files
 | 
			
		||||
enginedir=/usr/share/BBlog/engines
 | 
			
		||||
enginedir=/home/ian/Programs/BBlog2/engines
 | 
			
		||||
 | 
			
		||||
# version
 | 
			
		||||
version=2.1
 | 
			
		||||
version=2.3
 | 
			
		||||
 | 
			
		||||
function print_config {
 | 
			
		||||
  echo "engine: $engine"
 | 
			
		||||
@@ -223,18 +222,27 @@ function replace_format {
 | 
			
		||||
 | 
			
		||||
    # apply filter
 | 
			
		||||
    if [ -n "$filter" ]; then
 | 
			
		||||
      sed_cmd=$(eval "echo \$filter_$filter")
 | 
			
		||||
      # replace '%' inside filter text
 | 
			
		||||
      sed_cmd=$(replace_format "$(eval echo \$filter_$filter)")
 | 
			
		||||
      replacement=$(eval "echo \$$field" | sed -r "$sed_cmd" )
 | 
			
		||||
    else
 | 
			
		||||
      replacement=$(eval "echo \$$field")
 | 
			
		||||
    fi
 | 
			
		||||
  
 | 
			
		||||
    # escape '%' in replacement
 | 
			
		||||
    replacement="${replacement//\%/::iansays:percent::}"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    out="${out//\%$command\%/$replacement}"
 | 
			
		||||
  done
 | 
			
		||||
 | 
			
		||||
  # finish replacing newlines
 | 
			
		||||
  out="${out//\\n/%}"
 | 
			
		||||
  out=$(echo "$out" | tr "%" "\n")
 | 
			
		||||
 | 
			
		||||
  # un-escape '%' in replacement
 | 
			
		||||
  out="${out//::iansays:percent::/\%}"
 | 
			
		||||
 | 
			
		||||
  echo "$out"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -266,9 +274,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
 | 
			
		||||
@@ -277,6 +287,7 @@ function inverse_map_citeref {
 | 
			
		||||
	foundref=1
 | 
			
		||||
	return 1
 | 
			
		||||
      fi
 | 
			
		||||
    done
 | 
			
		||||
  done && echo "$foundref$newref"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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,url FROM bibliography"
 | 
			
		||||
base_SQL_noprauth="SELECT title,author,journal,year,token,doi,arxiv,citeref,bibtex,url 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
 | 
			
		||||
@@ -36,7 +39,7 @@ function generate_SQL_alpha {
 | 
			
		||||
      foundit=0
 | 
			
		||||
      if [ ${#extra} -gt 0 ]; then
 | 
			
		||||
	for entry in "${extra[@]}"; do
 | 
			
		||||
	ref="${entry#*:*:}"
 | 
			
		||||
	  ref="${entry#*:}"
 | 
			
		||||
	  ref="${ref%%:*}"
 | 
			
		||||
	  if [ "$ref" = "$citeref" ]; then
 | 
			
		||||
	    foundit=1
 | 
			
		||||
@@ -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
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,5 @@
 | 
			
		||||
.Dd $Mdocdate: May 2 2017 $
 | 
			
		||||
.Dt BBLOG 2.1
 | 
			
		||||
.Dd $Mdocdate: July 26 2023 $
 | 
			
		||||
.Dt BBLOG 2.3
 | 
			
		||||
.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-2017
 | 
			
		||||
copyright Ian Jauslin 2015-2023
 | 
			
		||||
.Sh SEE ALSO
 | 
			
		||||
.Sx BBlog-sqlite Ns (7)
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
.Dd $Mdocdate: May 2 2017 $
 | 
			
		||||
.Dd $Mdocdate: July 26 2023 $
 | 
			
		||||
.Dt BBLOG-sqlite
 | 
			
		||||
.Os
 | 
			
		||||
.Sh DESCRIPTION
 | 
			
		||||
@@ -28,11 +28,13 @@ label of the reference
 | 
			
		||||
.It prauth
 | 
			
		||||
bibliography entries are ordered alphabetically with respect to this entry
 | 
			
		||||
label of the reference
 | 
			
		||||
.It url
 | 
			
		||||
link to paper
 | 
			
		||||
.El
 | 
			
		||||
.Sh AUTHORS
 | 
			
		||||
The sqlite BBlog engine was written by Ian Jauslin.
 | 
			
		||||
.Sh COPYRIGHT
 | 
			
		||||
copyright Ian Jauslin 2015-2017
 | 
			
		||||
copyright Ian Jauslin 2015-2023
 | 
			
		||||
.Sh SEE ALSO
 | 
			
		||||
.Sx BBlog Ns (1) ,
 | 
			
		||||
.Sx sqlite3 Ns (1)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user