Commit 96e119bb authored by Hans-Peter Deifel's avatar Hans-Peter Deifel

Merge branch 'master' into enterprise

parents 40797251 4c0b94bc
......@@ -33,11 +33,7 @@
sm[i].disabled = true;
var xhr = new XMLHttpRequest();
xhr.open(form.method, form.action);
var data = new FormData();
for(var i=0; i < form.elements.length; i++) {
if(form.elements[i].type == 'submit') continue;
data.append(form.elements[i].name, form.elements[i].value);
}
var data = new FormData(form);
data.append(ev.target.name, ev.target.value);
xhr.onloadend = function(ev) {
if(xhr.status == 200) {
......
......@@ -45,10 +45,10 @@ def readMeta(pdf, isFileName=True):
### this works for pdfs that have nice unicode dots in the header, which are
### to my knowledge those of 12 SS and later
ss_long_filter_regex = re.compile("^SS ?20(..) • ([\S ]+) • ([\S ]+) • ([\S ]+)", re.MULTILINE | re.UNICODE)
ss_short_filter_regex = re.compile("^SS ?(..) • ([\S ]+) • ([\S ]+) • ([\S ]+)", re.MULTILINE | re.UNICODE)
ws_long_filter_regex = re.compile("^WS ?..(..)/.. ? • ([\S ]+) • ([\S ]+) • ([\S ]+)", re.MULTILINE | re.UNICODE)
ws_short_filter_regex = re.compile("^WS ?(..)/.. • ([\S ]+) • ([\S ]+) • ([\S ]+)", re.MULTILINE | re.UNICODE)
ss_long_filter_regex = re.compile("^SS(?: |')?20(..) • ([\S ]+) • ([\S ]+) • ([\S ]+)", re.MULTILINE | re.UNICODE)
ss_short_filter_regex = re.compile("^SS(?: |')?(..) • ([\S ]+) • ([\S ]+) • ([\S ]+)", re.MULTILINE | re.UNICODE)
ws_long_filter_regex = re.compile("^WS(?: |')?..(..)/.. ? • ([\S ]+) • ([\S ]+) • ([\S ]+)", re.MULTILINE | re.UNICODE)
ws_short_filter_regex = re.compile("^WS(?: |')?(..)/.. • ([\S ]+) • ([\S ]+) • ([\S ]+)", re.MULTILINE | re.UNICODE)
meta = {}
match = None
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment