Skip to content

Commit bb811c4

Browse files
committed
Added support for multiple examples per barcode, improved user documentation, comsumed new logging library, removed /types/ endpoint.
Reviewed-on: https://git.mclarkdev.com/BarcodeAPI.org/server/pulls/18
2 parents b9eb582 + b58178c commit bb811c4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+298
-216
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
/cache/
77
/logs/
88
/uploads/
9-
resources/blacklist.conf
109
/cache/
10+
/config/production/
1111
*.snap

config/types/AprilTag.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
},
1818
"checkdigit": 0,
1919
"nonprinting": false,
20-
"example": "tag36h11:0",
20+
"example": [
21+
"tag36h11:0"
22+
],
2123
"pattern": {
2224
"auto": "^tag.*:[0-9]{1,5}$",
2325
"extended": "^tag.*:[0-9]{1,5}$"
@@ -38,4 +40,4 @@
3840
"step": 1
3941
}
4042
}
41-
}
43+
}

config/types/Aztec.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
},
1717
"checkdigit": 0,
1818
"nonprinting": true,
19-
"example": "Aztec Barcode",
19+
"example": [
20+
"Aztec Barcode"
21+
],
2022
"pattern": {
2123
"auto": "^[ !#$()*.\\/0-9=?A-Z_a-z~]{1,16}$",
2224
"extended": "^[ !\\\"#$%&\\'()*+,\\-.\\/0-9:;<=>?@A-Z\\[\\]^_`a-z{|}~]+$"

config/types/CODABAR.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
},
1717
"checkdigit": 0,
1818
"nonprinting": false,
19-
"example": "1234567890",
19+
"example": [
20+
"1234567890"
21+
],
2022
"pattern": {
2123
"auto": "^[0-9:$]{4,12}$",
2224
"extended": "^[0-9\\-:$\\/.+]{1,22}$"

config/types/Code128.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
},
1919
"checkdigit": 0,
2020
"nonprinting": true,
21-
"example": "Try Me!",
21+
"example": [
22+
"Try Me!",
23+
"ABCD-1234"
24+
],
2225
"pattern": {
2326
"auto": "^[ !#$()*.\\/0-9=?A-Za-z~]{1,12}$",
2427
"extended": "^[ !\\\"#$%&\\'()*+,\\-.\\/0-9:;<=>?@A-Z\\[\\]^_`a-z{|}~]{1,48}$"
@@ -99,4 +102,4 @@
99102
"pattern": "[0-9A-F]{6}"
100103
}
101104
}
102-
}
105+
}

config/types/Code39.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
},
1919
"checkdigit": 0,
2020
"nonprinting": false,
21-
"example": "TRY 39",
21+
"example": [
22+
"TRY 39"
23+
],
2224
"pattern": {
2325
"auto": "^[A-Z0-9 $.\\/]{1,12}$",
2426
"extended": "^[A-Z*0-9 \\-$%.\\/+]{1,30}$"
@@ -99,4 +101,4 @@
99101
"pattern": "[0-9A-F]{6}"
100102
}
101103
}
102-
}
104+
}

config/types/DataMatrix.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
},
2121
"checkdigit": 0,
2222
"nonprinting": true,
23-
"example": "Data Matrix Barcode",
23+
"example": [
24+
"Data Matrix Barcode"
25+
],
2426
"pattern": {
2527
"auto": "^[ !\\\"#$%&\\'()*+,\\-.\\/0-9:;<=>?@A-Z\\[\\]^_`a-z{|}~]{1,2335}$",
2628
"extended": "^[ !\\\"#$%&\\'()*+,\\-.\\/0-9:;<=>?@A-Z\\[\\]^_`a-z{|}~]{1,2335}$"
@@ -69,4 +71,4 @@
6971
"pattern": "[0-9A-F]{6}"
7072
}
7173
}
72-
}
74+
}

config/types/EAN13.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
},
1919
"checkdigit": 13,
2020
"nonprinting": false,
21-
"example": "1234567890128",
21+
"example": [
22+
"1234567890128"
23+
],
2224
"pattern": {
2325
"auto": "^[0-9]{13}$",
2426
"extended": "^[0-9]{12,13}(\\+(([0-9]{2})|([0-9]{5}))){0,1}$"

config/types/EAN8.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
},
1919
"checkdigit": 8,
2020
"nonprinting": false,
21-
"example": "01234565",
21+
"example": [
22+
"01234565"
23+
],
2224
"pattern": {
2325
"auto": "^[0-9]{8}$",
2426
"extended": "^[0-9]{7,8}(\\+(([0-9]{2})|([0-9]{5}))){0,1}$"
@@ -99,4 +101,4 @@
99101
"pattern": "[0-9A-F]{6}"
100102
}
101103
}
102-
}
104+
}

config/types/ITF14.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
},
2121
"checkdigit": 0,
2222
"nonprinting": false,
23-
"example": "98765432109213",
23+
"example": [
24+
"98765432109213"
25+
],
2426
"pattern": {
2527
"auto": "",
2628
"extended": "^[0-9]{14}$"
@@ -101,4 +103,4 @@
101103
"pattern": "[0-9A-F]{6}"
102104
}
103105
}
104-
}
106+
}

0 commit comments

Comments
 (0)