update generic buttons

diff --git a/program/everything/2014-10-09-142144_1600x900_scrot.png b/program/everything/2014-10-09-142144_1600x900_scrot.png
deleted file mode 100644 (file)
index 7a06493..0000000
Binary files a/program/everything/2014-10-09-142144_1600x900_scrot.png and /dev/null differ

diff --git a/program/everything/buttons.py b/program/everything/buttons.py
new file mode 100644 (file)
index 0000000..db9e944
--- /dev/null
+++ b/program/everything/buttons.py
@@ -0,0 +1,11 @@
+BUTTONPAIRS = [
+    ('#0000FF', 'Waar'),
+    ('#00FF00', 'Wat'),
+    ('#FF0000', 'Tijd'),
+    ('#8B0000', 'Datum'),
+    ('#008B00', 'NonKeyword')]
+
+BUTTONSKEL = """<button style="color:{0}" onclick="javascript:stylizeHighlight\
+edString('{0}')">{1}</button>"""
+
+BUTTONS = '\n'.join(BUTTONSKEL.format(*b) for b in BUTTONPAIRS)

diff --git a/program/everything/crawler.db b/program/everything/crawler.db
index 01a49ea..5c138d8 100755 (executable)
--- a/program/everything/crawler.db
+++ b/program/everything/crawler.db
@@ -1,1889 +1,79 @@
 (dp0
-S'example_offline'
+S'Offline_Paradiso'
 p1
 (dp2
-S'website'
+S'name'
 p3
-S'www.paradiso.nl'
+g1
+sS'headers'
 p4
-sS'name'
-p5
-S'example_offline'
-p6
+(lp5
 sS'url'
-p7
+p6
 S'localhost/py/xml/paradiso.rss.xml'
+p7
+sS'content'
 p8
-sS'venue'
-p9
-S'Paradiso'
-p10
-sS'dloc'
+(lp9
+(lp10
+S'zaterdag 31 mei 2014  - Lentekabinet Festival Afterparty   -   Locatie: Tolhuistuin (zaal)'
 p11
-S'Zaal'
+aS''
 p12
-sS'db'
-p13
-(dp14
-sS'last_run'
+aa(lp13
+S'<span class="uiWebviewHighlight" style="color: white; background-color: rgb(139, 0, 0);">vrijdag 4 juli 2014</span> <span class="uiWebviewHighlight" style="color: white; background-color: rgb(255, 0, 0);">20:30</span> - <span class="uiWebviewHighlight" style="color: white; background-color: rgb(0, 255, 0);">The Crimson Projekct</span>   -   Locatie: <span class="uiWebviewHighlight" style="color: white; background-color: rgb(0, 0, 255);">Tolhuistuin (zaal)</span>'
+p14
+aS'Muziek rond King Crimson'
 p15
-F1412848697.003789
-sS'content'
-p16
-(lp17
-(lp18
-S'zaterdag 31 mei 2014  - Lentekabinet Festival Afterparty   -   Locatie: Tolhuistuin (zaal)'
+aa(lp16
+S'<span class="uiWebviewHighlight" style="color: white; background-color: rgb(139, 0, 0);">dinsdag 10 juni 2014</span> <span class="uiWebviewHighlight" style="color: white; background-color: rgb(255, 0, 0);">20:30</span> - <span class="uiWebviewHighlight" style="color: white; background-color: rgb(0, 255, 0);">Het Ultieme Natuurkunde Feestje \xe2\x80\x93 keynote Amanda Gefter</span>'
+p17
+ag12
+aa(lp18
+S'dinsdag 12 augustus 2014 21:00 - Kevin Drew - Locatie: Bitterzoet'
 p19
-aS''
+aS'mede-oprichter Broken Social Scene solo'
 p20
 aa(lp21
-S'vrijdag 4 juli 2014 20:30 - The Crimson Projekct   -   Locatie: Tolhuistuin (zaal)'
+S'vrijdag 4 juli 2014 22:00 - Palenke Soultribe'
 p22
-aS'Muziek rond King Crimson'
+aS'Electronische muziek en Afro-Colombiaanse ritmes'
 p23
 aa(lp24
-S'dinsdag 10 juni 2014 20:30 - Het Ultieme Natuurkunde Feestje \xe2\x80\x93 keynote Amanda Gefter'
+S'maandag 3 november 2014 20:15 - Eefje de Visser: Waterwereldsteden - Locatie: Het Concertgebouw'
 p25
-ag20
+ag12
 aa(lp26
-S'dinsdag 12 augustus 2014 21:00 - Kevin Drew - Locatie: Bitterzoet'
+S'zaterdag 27 september 2014 20:30 - A Great Big World - Locatie: Tolhuistuin (zaal)'
 p27
-aS'mede-oprichter Broken Social Scene solo'
+aS'Hitschrijvers uit New York'
 p28
 aa(lp29
-S'vrijdag 4 juli 2014 22:00 - Palenke Soultribe'
+S'zaterdag 7 juni 2014 23:00 - Benefietavond Marokkaanse Boot'
 p30
-aS'Electronische muziek en Afro-Colombiaanse ritmes'
+aS'Van Amsterdam naar Tanger'
 p31
 aa(lp32
-S'maandag 3 november 2014 20:15 - Eefje de Visser: Waterwereldsteden - Locatie: Het Concertgebouw'
+S'donderdag 13 november 2014 19:30 - Wouter Hamel'
 p33
-ag20
-aa(lp34
-S'<span class="uiWebviewHighlight" style="color: white; background-color: rgb(139, 0, 0);">zaterdag 27 september 2014</span> <span class="uiWebviewHighlight" style="color: white; background-color: red;">20:30</span> - <span class="uiWebviewHighlight" style="color: white; background-color: green;">A Great Big World</span> - Locatie: <span class="uiWebviewHighlight" style="color: white; background-color: blue;">Tolhuistuin (zaal)</span>'
-p35
-aS'Hitschrijvers uit New York'
+aS'Sprankelende jazzy pop'
+p34
+aa(lp35
+S'vrijdag 13 juni 2014 00:00 - Legends'
 p36
-aa(lp37
-S'zaterdag 7 juni 2014 23:00 - Benefietavond Marokkaanse Boot'
-p38
-aS'Van Amsterdam naar Tanger'
+ag12
+aasS'titledawg'
+p37
+(lp38
+S'\x04 \x03 - \x02   -   Locatie: \x01'
 p39
-aa(lp40
-S'donderdag 13 november 2014 19:30 - Wouter Hamel'
+aS'\x04 \x03 - \x02'
+p40
+asS'summarydawg'
 p41
-aS'Sprankelende jazzy pop'
-p42
-aa(lp43
-S'<span class="uiWebviewHighlight" style="color: white; background-color: rgb(139, 0, 0);">vrijdag 13 juni 2014</span> <span class="uiWebviewHighlight" style="color: white; background-color: red;">00:00</span> - <span class="uiWebviewHighlight" style="color: white; background-color: green;">Legends</span>'
-p44
-ag20
-aasS'headers'
-p45
-(lp46
-sS'summarydawg'
-p47
-(lp48
-sS'titledawg'
-p49
-(lp50
-S'\x01 \x02 - \x03 - Locatie: \x04'
-p51
-aS'\x01 \x02 - \x03'
-p52
-asS'freq'
-p53
+(lp42
+sS'freq'
+p43
 S'1d'
-p54
-sS'adress'
-p55
-S'Weteringschans 6-8, 1017 SG Amsterdam'
-p56
-ssS'example_online'
-p57
-(dp58
-S'website'
-p59
-S'www.paradiso.nl'
-p60
-sS'name'
-p61
-S'example_online'
-p62
-sS'url'
-p63
-S'http://www.paradiso.nl/rss.xml'
-p64
-sS'venue'
-p65
-S'Paradiso'
-p66
-sS'dloc'
-p67
-S'Zaal'
-p68
-sg13
-(dp69
-S'e38ee7e232264a9a4a1be377840e15c8'
-p70
-(dp71
-S'raw'
-p72
-ccopy_reg
-_reconstructor
-p73
-(cfeedparser
-FeedParserDict
-p74
-c__builtin__
-dict
-p75
-(dp76
-S'summary_detail'
-p77
-g73
-(g74
-g75
-(dp78
-S'base'
-p79
-Vhttp://www.paradiso.nl/rss.xml
-p80
-sS'type'
-p81
-Vtext/html
-p82
-sS'language'
-p83
-NsS'value'
-p84
-V
-p85
-stp86
-Rp87
-sS'links'
-p88
-(lp89
-g73
-(g74
-g75
-(dp90
-S'href'
-p91
-Vhttp://www.paradiso.nl/web/Agenda-Item/Cymbals-Eat-Guitars-Locatie-Paradiso-Noord-Tolhuistuin.htm
-p92
-sg81
-Vtext/html
-p93
-sS'rel'
-p94
-Valternate
-p95
-stp96
-Rp97
-asS'published_parsed'
-p98
-NsS'title'
-p99
-Vdinsdag 20 januari 2015 20:30 - Cymbals Eat Guitars   -   Locatie: Paradiso Noord, Tolhuistuin
-p100
-sS'summary'
-p101
-g85
-sS'title_detail'
-p102
-g73
-(g74
-g75
-(dp103
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p104
-sg81
-Vtext/plain
-p105
-sg83
-Nsg84
-g100
-stp106
-Rp107
-sS'link'
-p108
-g92
-sS'published'
-p109
-Vwo, 08 okt 2014 08:00:00 GMT
-p110
-stp111
-Rp112
-sS'results'
-p113
-(dp114
-S'waar'
-p115
-VParadiso Noord, Tolhuistuin
-p116
-sS'wat'
-p117
-VCymbals Eat Guitars  
-p118
-sS'datum'
-p119
-Vdinsdag 20 januari 2015
-p120
-sS'tijd'
-p121
-V20:30
-p122
-sssS'0a238f645e56e69ebd873ef5a9c87fe9'
-p123
-(dp124
-g72
-g73
-(g74
-g75
-(dp125
-S'summary_detail'
-p126
-g73
-(g74
-g75
-(dp127
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p128
-sg81
-g82
-sg83
-Nsg84
-g85
-stp129
-Rp130
-sg88
-(lp131
-g73
-(g74
-g75
-(dp132
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/Bassline-62.htm
-p133
-sg81
-g93
-sg94
-g95
-stp134
-Rp135
-asg98
-Nsg99
-Vvrijdag 21 november 2014 00:00 - Bassline
-p136
-sg101
-g85
-sS'title_detail'
-p137
-g73
-(g74
-g75
-(dp138
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p139
-sg81
-g105
-sg83
-Nsg84
-g136
-stp140
-Rp141
-sg108
-g133
-sg109
-Vdi, 07 okt 2014 10:19:00 GMT
-p142
-stp143
-Rp144
-sg113
-(dp145
-S'wat'
-p146
-VBassline
-p147
-sS'datum'
-p148
-Vvrijdag 21 november 2014
-p149
-sS'tijd'
-p150
-V00:00
-p151
-sssS'657c1eeafcecbcbb89e7a6e0c98424d0'
-p152
-(dp153
-g72
-g73
-(g74
-g75
-(dp154
-S'summary_detail'
-p155
-g73
-(g74
-g75
-(dp156
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p157
-sg81
-g82
-sg83
-Nsg84
-VParadiso's nieuwe Amsterdamse band-avond
-p158
-stp159
-Rp160
-sg88
-(lp161
-g73
-(g74
-g75
-(dp162
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/Scoop-3.htm
-p163
-sg81
-g93
-sg94
-g95
-stp164
-Rp165
-asg98
-Nsg99
-Vdonderdag 6 november 2014 22:00 - Scoop
-p166
-sg101
-g158
-sS'title_detail'
-p167
-g73
-(g74
-g75
-(dp168
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p169
-sg81
-g105
-sg83
-Nsg84
-g166
-stp170
-Rp171
-sg108
-g163
-sg109
-Vdi, 07 okt 2014 09:37:00 GMT
-p172
-stp173
-Rp174
-sg113
-(dp175
-S'wat'
-p176
-VScoop
-p177
-sS'datum'
-p178
-Vdonderdag 6 november 2014
-p179
-sS'tijd'
-p180
-V22:00
-p181
-sssS'95dd789f88003c9042c70ac5a19ee35a'
-p182
-(dp183
-g72
-g73
-(g74
-g75
-(dp184
-S'summary_detail'
-p185
-g73
-(g74
-g75
-(dp186
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p187
-sg81
-g82
-sg83
-Nsg84
-g85
-stp188
-Rp189
-sg88
-(lp190
-g73
-(g74
-g75
-(dp191
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/Sonic-Acts-en-Stedelijk-Museum-presenteren-Alvin-Lucier-masterclass-Locatie-Stedelijk-Museum-Amsterdam.htm
-p192
-sg81
-g93
-sg94
-g95
-stp193
-Rp194
-asg98
-Nsg99
-Vzondag 19 oktober 2014 11:00 - Sonic Acts en Stedelijk Museum presenteren: Alvin Lucier masterclass - Locatie: Stedelijk Museum Amsterdam
-p195
-sg101
-g85
-sS'title_detail'
-p196
-g73
-(g74
-g75
-(dp197
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p198
-sg81
-g105
-sg83
-Nsg84
-g195
-stp199
-Rp200
-sg108
-g192
-sg109
-Vdi, 07 okt 2014 12:48:00 GMT
-p201
-stp202
-Rp203
-sg113
-(dp204
-S'waar'
-p205
-VStedelijk Museum Amsterdam
-p206
-sS'wat'
-p207
-VSonic Acts en Stedelijk Museum presenteren: Alvin Lucier masterclass
-p208
-sS'datum'
-p209
-Vzondag 19 oktober 2014
-p210
-sS'tijd'
-p211
-V11:00
-p212
-sssS'acbb943c6cf1af72c0b1ded00030b4d4'
-p213
-(dp214
-g72
-g73
-(g74
-g75
-(dp215
-S'summary_detail'
-p216
-g73
-(g74
-g75
-(dp217
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p218
-sg81
-g82
-sg83
-Nsg84
-g85
-stp219
-Rp220
-sg88
-(lp221
-g73
-(g74
-g75
-(dp222
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/Wampire.htm
-p223
-sg81
-g93
-sg94
-g95
-stp224
-Rp225
-asg98
-Nsg99
-Vzondag 14 december 2014 21:00 - Wampire
-p226
-sg101
-g85
-sS'title_detail'
-p227
-g73
-(g74
-g75
-(dp228
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p229
-sg81
-g105
-sg83
-Nsg84
-g226
-stp230
-Rp231
-sg108
-g223
-sg109
-Vdi, 07 okt 2014 08:00:00 GMT
-p232
-stp233
-Rp234
-sg113
-(dp235
-S'wat'
-p236
-VWampire
-p237
-sS'datum'
-p238
-Vzondag 14 december 2014
-p239
-sS'tijd'
-p240
-V21:00
-p241
-sssS'a1d9e11f1e7ca0b6a0bf3bd647532456'
-p242
-(dp243
-g72
-g73
-(g74
-g75
-(dp244
-S'summary_detail'
-p245
-g73
-(g74
-g75
-(dp246
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p247
-sg81
-g82
-sg83
-Nsg84
-VDansnacht, alternatieve hits
-p248
-stp249
-Rp250
-sg88
-(lp251
-g73
-(g74
-g75
-(dp252
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/Noodlanding-319.htm
-p253
-sg81
-g93
-sg94
-g95
-stp254
-Rp255
-asg98
-Nsg99
-Vdonderdag 20 november 2014 23:30 - Noodlanding!
-p256
-sg101
-g248
-sS'title_detail'
-p257
-g73
-(g74
-g75
-(dp258
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p259
-sg81
-g105
-sg83
-Nsg84
-g256
-stp260
-Rp261
-sg108
-g253
-sg109
-Vdi, 07 okt 2014 10:10:00 GMT
-p262
-stp263
-Rp264
-sg113
-(dp265
-S'wat'
-p266
-VNoodlanding!
-p267
-sS'datum'
-p268
-Vdonderdag 20 november 2014
-p269
-sS'tijd'
-p270
-V23:30
-p271
-sssS'e6ca7124ad34fbd3e4f9c797390bd86b'
-p272
-(dp273
-g72
-g73
-(g74
-g75
-(dp274
-S'summary_detail'
-p275
-g73
-(g74
-g75
-(dp276
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p277
-sg81
-g82
-sg83
-Nsg84
-g85
-stp278
-Rp279
-sg88
-(lp280
-g73
-(g74
-g75
-(dp281
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/OCD-Moosh-Twist.htm
-p282
-sg81
-g93
-sg94
-g95
-stp283
-Rp284
-asg98
-Nsg99
-Vzaterdag 6 december 2014 22:00 - OCD: Moosh & Twist
-p285
-sg101
-g85
-sS'title_detail'
-p286
-g73
-(g74
-g75
-(dp287
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p288
-sg81
-g105
-sg83
-Nsg84
-g285
-stp289
-Rp290
-sg108
-g282
-sg109
-Vdi, 07 okt 2014 11:00:00 GMT
-p291
-stp292
-Rp293
-sg113
-(dp294
-S'wat'
-p295
-VOCD: Moosh & Twist
-p296
-sS'datum'
-p297
-Vzaterdag 6 december 2014
-p298
-sS'tijd'
-p299
-V22:00
-p300
-sssS'fdbfb2ac60d3e9e14d3b9ef8b1c26795'
-p301
-(dp302
-g72
-g73
-(g74
-g75
-(dp303
-S'summary_detail'
-p304
-g73
-(g74
-g75
-(dp305
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p306
-sg81
-g82
-sg83
-Nsg84
-g85
-stp307
-Rp308
-sg88
-(lp309
-g73
-(g74
-g75
-(dp310
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/Tinashe-Locatie-Paradiso-Noord-Tolhuistuin.htm
-p311
-sg81
-g93
-sg94
-g95
-stp312
-Rp313
-asg98
-Nsg99
-Vvrijdag 6 maart 2015 20:30 - Tinashe - Locatie: Paradiso Noord, Tolhuistuin
-p314
-sg101
-g85
-sS'title_detail'
-p315
-g73
-(g74
-g75
-(dp316
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p317
-sg81
-g105
-sg83
-Nsg84
-g314
-stp318
-Rp319
-sg108
-g311
-sg109
-Vma, 06 okt 2014 15:00:00 GMT
-p320
-stp321
-Rp322
-sg113
-(dp323
-S'waar'
-p324
-VParadiso Noord, Tolhuistuin
-p325
-sS'wat'
-p326
-VTinashe
-p327
-sS'datum'
-p328
-Vvrijdag 6 maart 2015
-p329
-sS'tijd'
-p330
-V20:30
-p331
-sssS'1face736083021aa8647f9ad6ef319fd'
-p332
-(dp333
-g72
-g73
-(g74
-g75
-(dp334
-S'summary_detail'
-p335
-g73
-(g74
-g75
-(dp336
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p337
-sg81
-g82
-sg83
-Nsg84
-g85
-stp338
-Rp339
-sg88
-(lp340
-g73
-(g74
-g75
-(dp341
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/Dondergrondse-hosted-by-Sweet-Dreams-1.htm
-p342
-sg81
-g93
-sg94
-g95
-stp343
-Rp344
-asg98
-Nsg99
-Vdonderdag 13 november 2014 23:30 - Dondergrondse:  hosted by Sweet Dreams
-p345
-sg101
-g85
-sS'title_detail'
-p346
-g73
-(g74
-g75
-(dp347
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p348
-sg81
-g105
-sg83
-Nsg84
-g345
-stp349
-Rp350
-sg108
-g342
-sg109
-Vma, 06 okt 2014 12:28:00 GMT
-p351
-stp352
-Rp353
-sg113
-(dp354
-S'wat'
-p355
-VDondergrondse:  hosted by Sweet Dreams
-p356
-sS'datum'
-p357
-Vdonderdag 13 november 2014
-p358
-sS'tijd'
-p359
-V23:30
-p360
-sssS'43b27a623dde2e2ae2f524e97d10cd21'
-p361
-(dp362
-g72
-g73
-(g74
-g75
-(dp363
-S'summary_detail'
-p364
-g73
-(g74
-g75
-(dp365
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p366
-sg81
-g82
-sg83
-Nsg84
-g85
-stp367
-Rp368
-sg88
-(lp369
-g73
-(g74
-g75
-(dp370
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/Olof-Arnalds-1.htm
-p371
-sg81
-g93
-sg94
-g95
-stp372
-Rp373
-asg98
-Nsg99
-Vdinsdag 2 december 2014 20:00 - Olöf Arnalds
-p374
-sg101
-g85
-sS'title_detail'
-p375
-g73
-(g74
-g75
-(dp376
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p377
-sg81
-g105
-sg83
-Nsg84
-g374
-stp378
-Rp379
-sg108
-g371
-sg109
-Vdi, 07 okt 2014 08:00:00 GMT
-p380
-stp381
-Rp382
-sg113
-(dp383
-S'wat'
-p384
-VOlöf Arnalds
-p385
-sS'datum'
-p386
-Vdinsdag 2 december 2014
-p387
-sS'tijd'
-p388
-V20:00
-p389
-sssS'f35e31f417dd6002639a89a73067439d'
-p390
-(dp391
-g72
-g73
-(g74
-g75
-(dp392
-S'summary_detail'
-p393
-g73
-(g74
-g75
-(dp394
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p395
-sg81
-g82
-sg83
-Nsg84
-g85
-stp396
-Rp397
-sg88
-(lp398
-g73
-(g74
-g75
-(dp399
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/Sonic-Acts-presenteert-A-Day-of-Noise-Locatie-Temporary-Art-Centre-Eindhoven.htm
-p400
-sg81
-g93
-sg94
-g95
-stp401
-Rp402
-asg98
-Nsg99
-Vzaterdag 25 oktober 2014 12:30 - Sonic Acts presenteert: A Day of Noise - Locatie: Temporary Art Centre, Eindhoven
-p403
-sg101
-g85
-sS'title_detail'
-p404
-g73
-(g74
-g75
-(dp405
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p406
-sg81
-g105
-sg83
-Nsg84
-g403
-stp407
-Rp408
-sg108
-g400
-sg109
-Vdi, 07 okt 2014 12:59:00 GMT
-p409
-stp410
-Rp411
-sg113
-(dp412
-S'waar'
-p413
-VTemporary Art Centre, Eindhoven
-p414
-sS'wat'
-p415
-VSonic Acts presenteert: A Day of Noise
-p416
-sS'datum'
-p417
-Vzaterdag 25 oktober 2014
-p418
-sS'tijd'
-p419
-V12:30
-p420
-sssS'574c8cec18156826aa679ff5790497ed'
-p421
-(dp422
-g72
-g73
-(g74
-g75
-(dp423
-S'summary_detail'
-p424
-g73
-(g74
-g75
-(dp425
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p426
-sg81
-g82
-sg83
-Nsg84
-g85
-stp427
-Rp428
-sg88
-(lp429
-g73
-(g74
-g75
-(dp430
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/Dondergrondse-hosted-by-Dark-Allies-Live-Schonwald.htm
-p431
-sg81
-g93
-sg94
-g95
-stp432
-Rp433
-asg98
-Nsg99
-Vdonderdag 27 november 2014 23:30 - Dondergrondse: hosted by Dark Allies - Live: Schonwald
-p434
-sg101
-g85
-sS'title_detail'
-p435
-g73
-(g74
-g75
-(dp436
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p437
-sg81
-g105
-sg83
-Nsg84
-g434
-stp438
-Rp439
-sg108
-g431
-sg109
-Vma, 06 okt 2014 12:38:00 GMT
-p440
-stp441
-Rp442
-sg113
-(dp443
-S'wat'
-p444
-VLive: Schonwald
-p445
-sS'datum'
-p446
-Vdonderdag 27 november 2014 23:30 - Dondergrondse: hosted by Dark
-p447
-sS'tijd'
-p448
-VAllies
-p449
-sssS'e9339ddb7094ed9da8d647f2e2bf40dc'
-p450
-(dp451
-g72
-g73
-(g74
-g75
-(dp452
-S'summary_detail'
-p453
-g73
-(g74
-g75
-(dp454
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p455
-sg81
-g82
-sg83
-Nsg84
-g85
-stp456
-Rp457
-sg88
-(lp458
-g73
-(g74
-g75
-(dp459
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/Lizz-Wright-3.htm
-p460
-sg81
-g93
-sg94
-g95
-stp461
-Rp462
-asg98
-Nsg99
-Vwoensdag 20 mei 2015 20:30 - Lizz Wright
-p463
-sg101
-g85
-sS'title_detail'
-p464
-g73
-(g74
-g75
-(dp465
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p466
-sg81
-g105
-sg83
-Nsg84
-g463
-stp467
-Rp468
-sg108
-g460
-sg109
-Vwo, 08 okt 2014 08:00:00 GMT
-p469
-stp470
-Rp471
-sg113
-(dp472
-S'wat'
-p473
-VLizz Wright
-p474
-sS'datum'
-p475
-Vwoensdag 20 mei 2015
-p476
-sS'tijd'
-p477
-V20:30
-p478
-sssS'1f2ff8c8701f6f390c31433bf0b89e6a'
-p479
-(dp480
-g72
-g73
-(g74
-g75
-(dp481
-S'summary_detail'
-p482
-g73
-(g74
-g75
-(dp483
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p484
-sg81
-g82
-sg83
-Nsg84
-g85
-stp485
-Rp486
-sg88
-(lp487
-g73
-(g74
-g75
-(dp488
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/De-Wilde-Schoonzonen-Lieve-Bertha-Me-and-Mr-Jansen-en-Rogier-Pelgrim.htm
-p489
-sg81
-g93
-sg94
-g95
-stp490
-Rp491
-asg98
-Nsg99
-Vdonderdag 8 januari 2015 19:00 - De Wilde Schoonzonen: Lieve Bertha, Me and Mr Jansen en Rogier Pelgrim
-p492
-sg101
-g85
-sS'title_detail'
-p493
-g73
-(g74
-g75
-(dp494
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p495
-sg81
-g105
-sg83
-Nsg84
-g492
-stp496
-Rp497
-sg108
-g489
-sg109
-Vdi, 07 okt 2014 09:49:00 GMT
-p498
-stp499
-Rp500
-sg113
-(dp501
-S'wat'
-p502
-VDe Wilde Schoonzonen: Lieve Bertha, Me and Mr Jansen en Rogier Pelgrim
-p503
-sS'datum'
-p504
-Vdonderdag 8 januari 2015
-p505
-sS'tijd'
-p506
-V19:00
-p507
-sssS'9f2daba4759f50b561f8dd4eba3d1084'
-p508
-(dp509
-g72
-g73
-(g74
-g75
-(dp510
-S'summary_detail'
-p511
-g73
-(g74
-g75
-(dp512
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p513
-sg81
-g82
-sg83
-Nsg84
-g85
-stp514
-Rp515
-sg88
-(lp516
-g73
-(g74
-g75
-(dp517
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/Big-Night-Out-9.htm
-p518
-sg81
-g93
-sg94
-g95
-stp519
-Rp520
-asg98
-Nsg99
-Vzaterdag 22 november 2014 23:00 - Big Night Out
-p521
-sg101
-g85
-sS'title_detail'
-p522
-g73
-(g74
-g75
-(dp523
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p524
-sg81
-g105
-sg83
-Nsg84
-g521
-stp525
-Rp526
-sg108
-g518
-sg109
-Vma, 06 okt 2014 13:29:00 GMT
-p527
-stp528
-Rp529
-sg113
-(dp530
-S'wat'
-p531
-VBig Night Out
-p532
-sS'datum'
-p533
-Vzaterdag 22 november 2014
-p534
-sS'tijd'
-p535
-V23:00
-p536
-sssS'fde49eaac2b8c1f12d43674349e31bd8'
-p537
-(dp538
-g72
-g73
-(g74
-g75
-(dp539
-S'summary_detail'
-p540
-g73
-(g74
-g75
-(dp541
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p542
-sg81
-g82
-sg83
-Nsg84
-g85
-stp543
-Rp544
-sg88
-(lp545
-g73
-(g74
-g75
-(dp546
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/Hanggai-Locatie-Paradiso-Noord-Tolhuistuin.htm
-p547
-sg81
-g93
-sg94
-g95
-stp548
-Rp549
-asg98
-Nsg99
-Vwoensdag 8 april 2015 20:30 - Hanggai   -   Locatie: Paradiso Noord, Tolhuistuin
-p550
-sg101
-g85
-sS'title_detail'
-p551
-g73
-(g74
-g75
-(dp552
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p553
-sg81
-g105
-sg83
-Nsg84
-g550
-stp554
-Rp555
-sg108
-g547
-sg109
-Vwo, 08 okt 2014 08:10:00 GMT
-p556
-stp557
-Rp558
-sg113
-(dp559
-S'waar'
-p560
-VParadiso Noord, Tolhuistuin
-p561
-sS'wat'
-p562
-VHanggai  
-p563
-sS'datum'
-p564
-Vwoensdag 8 april 2015
-p565
-sS'tijd'
-p566
-V20:30
-p567
-sssS'2ba55537287a2bda763aa4f2171e6cdf'
-p568
-(dp569
-g72
-g73
-(g74
-g75
-(dp570
-S'summary_detail'
-p571
-g73
-(g74
-g75
-(dp572
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p573
-sg81
-g82
-sg83
-Nsg84
-VDansnacht, alternatieve hits
-p574
-stp575
-Rp576
-sg88
-(lp577
-g73
-(g74
-g75
-(dp578
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/Noodlanding-318.htm
-p579
-sg81
-g93
-sg94
-g95
-stp580
-Rp581
-asg98
-Nsg99
-Vdonderdag 13 november 2014 23:30 - Noodlanding!
-p582
-sg101
-g574
-sS'title_detail'
-p583
-g73
-(g74
-g75
-(dp584
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p585
-sg81
-g105
-sg83
-Nsg84
-g582
-stp586
-Rp587
-sg108
-g579
-sg109
-Vdi, 07 okt 2014 10:08:00 GMT
-p588
-stp589
-Rp590
-sg113
-(dp591
-S'wat'
-p592
-VNoodlanding!
-p593
-sS'datum'
-p594
-Vdonderdag 13 november 2014
-p595
-sS'tijd'
-p596
-V23:30
-p597
-sssS'9027c8871e4dcb211bc5564e187aaf4b'
-p598
-(dp599
-g72
-g73
-(g74
-g75
-(dp600
-S'summary_detail'
-p601
-g73
-(g74
-g75
-(dp602
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p603
-sg81
-g82
-sg83
-Nsg84
-g85
-stp604
-Rp605
-sg88
-(lp606
-g73
-(g74
-g75
-(dp607
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/Mieke-Stemerdink-Locatie-Paradiso-Noord-Tolhuistuin.htm
-p608
-sg81
-g93
-sg94
-g95
-stp609
-Rp610
-asg98
-Nsg99
-Vdonderdag 23 oktober 2014 20:30 - Mieke Stemerdink - Locatie: Paradiso Noord, Tolhuistuin
-p611
-sg101
-g85
-sS'title_detail'
-p612
-g73
-(g74
-g75
-(dp613
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p614
-sg81
-g105
-sg83
-Nsg84
-g611
-stp615
-Rp616
-sg108
-g608
-sg109
-Vma, 06 okt 2014 12:33:00 GMT
-p617
-stp618
-Rp619
-sg113
-(dp620
-S'waar'
-p621
-VParadiso Noord, Tolhuistuin
-p622
-sS'wat'
-p623
-VMieke Stemerdink
-p624
-sS'datum'
-p625
-Vdonderdag 23 oktober 2014
-p626
-sS'tijd'
-p627
-V20:30
-p628
-sssS'd102a10837017110384ebc60bf5c9865'
-p629
-(dp630
-g72
-g73
-(g74
-g75
-(dp631
-S'summary_detail'
-p632
-g73
-(g74
-g75
-(dp633
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p634
-sg81
-g82
-sg83
-Nsg84
-VHiphop, funk, soul en disco
-p635
-stp636
-Rp637
-sg88
-(lp638
-g73
-(g74
-g75
-(dp639
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/Zwarte-Koffie-9.htm
-p640
-sg81
-g93
-sg94
-g95
-stp641
-Rp642
-asg98
-Nsg99
-Vvrijdag 7 november 2014 00:00 - Zwarte Koffie
-p643
-sg101
-g635
-sS'title_detail'
-p644
-g73
-(g74
-g75
-(dp645
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p646
-sg81
-g105
-sg83
-Nsg84
-g643
-stp647
-Rp648
-sg108
-g640
-sg109
-Vma, 06 okt 2014 14:10:00 GMT
-p649
-stp650
-Rp651
-sg113
-(dp652
-S'wat'
-p653
-VZwarte Koffie
-p654
-sS'datum'
-p655
-Vvrijdag 7 november 2014
-p656
-sS'tijd'
-p657
-V00:00
-p658
-sssS'bc0a1132131211c046ddf237824ad537'
-p659
-(dp660
-g72
-g73
-(g74
-g75
-(dp661
-S'summary_detail'
-p662
-g73
-(g74
-g75
-(dp663
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p664
-sg81
-g82
-sg83
-Nsg84
-g85
-stp665
-Rp666
-sg88
-(lp667
-g73
-(g74
-g75
-(dp668
-g91
-Vhttp://www.paradiso.nl/web/Agenda-Item/Dondergrondse-hosted-by-The-Daily-Indie-Live-Eerie-Wanda.htm
-p669
-sg81
-g93
-sg94
-g95
-stp670
-Rp671
-asg98
-Nsg99
-Vdonderdag 20 november 2014 22:00 - Dondergrondse: hosted by The Daily Indie - Live: Eerie Wanda
-p672
-sg101
-g85
-sS'title_detail'
-p673
-g73
-(g74
-g75
-(dp674
-g79
-Vhttp://www.paradiso.nl/rss.xml
-p675
-sg81
-g105
-sg83
-Nsg84
-g672
-stp676
-Rp677
-sg108
-g669
-sg109
-Vma, 06 okt 2014 12:34:00 GMT
-p678
-stp679
-Rp680
-sg113
-(dp681
-S'wat'
-p682
-VLive: Eerie Wanda
-p683
-sS'datum'
-p684
-Vdonderdag 20 november 2014 22:00 - Dondergrondse: hosted by The Daily
-p685
-sS'tijd'
-p686
-VIndie
-p687
-ssssg15
-F1412848697.01509
-sS'content'
-p688
-(lp689
-(lp690
-S'<span class="uiWebviewHighlight" style="color: white; background-color: rgb(139, 0, 0);">woensdag 8 april 2015</span> <span class="uiWebviewHighlight" style="color: white; background-color: red;">20:30</span> - <span class="uiWebviewHighlight" style="color: white; background-color: green;">Hanggai</span>   -   Locatie: <span class="uiWebviewHighlight" style="color: white; background-color: blue;">Paradiso Noord, Tolhuistuin</span>'
-p691
-ag20
-aa(lp692
-S'dinsdag 20 januari 2015 20:30 - Cymbals Eat Guitars   -   Locatie: Paradiso Noord, Tolhuistuin'
-p693
-ag20
-aa(lp694
-S'zaterdag 25 oktober 2014 12:30 - Sonic Acts presenteert: A Day of Noise - Locatie: Temporary Art Centre, Eindhoven'
-p695
-ag20
-aa(lp696
-S'zondag 19 oktober 2014 11:00 - Sonic Acts en Stedelijk Museum presenteren: Alvin Lucier masterclass - Locatie: Stedelijk Museum Amsterdam'
-p697
-ag20
-aa(lp698
-S'<span class="uiWebviewHighlight" style="color: white; background-color: rgb(139, 0, 0);">zaterdag 6 december 2014</span> <span class="uiWebviewHighlight" style="color: white; background-color: red;">22:00</span> - <span class="uiWebviewHighlight" style="color: white; background-color: green;">OCD: Moosh &amp; Twist</span>'
-p699
-ag20
-aa(lp700
-S'vrijdag 21 november 2014 00:00 - Bassline'
-p701
-ag20
-aa(lp702
-S'donderdag 20 november 2014 23:30 - Noodlanding!'
-p703
-aS'Dansnacht, alternatieve hits'
-p704
-aa(lp705
-S'donderdag 13 november 2014 23:30 - Noodlanding!'
-p706
-aS'Dansnacht, alternatieve hits'
-p707
-aa(lp708
-S'donderdag 8 januari 2015 19:00 - De Wilde Schoonzonen: Lieve Bertha, Me and Mr Jansen en Rogier Pelgrim'
-p709
-ag20
-aa(lp710
-S'donderdag 6 november 2014 22:00 - Scoop'
-p711
-aS"Paradiso's nieuwe Amsterdamse band-avond"
-p712
-aasS'headers'
-p713
-(lp714
-sS'summarydawg'
-p715
-(lp716
-sS'titledawg'
-p717
-(lp718
-S'\x01 \x02 - \x03   -   Locatie: \x04'
-p719
-aS'\x01 \x02 - \x03'
-p720
-asS'freq'
-p721
-S'1d'
-p722
-sS'adress'
-p723
-S'Weteringschans 6-8, 1017 SG Amsterdam'
-p724
+p44
 ss.
\ No newline at end of file

diff --git a/program/everything/crawler.py b/program/everything/crawler.py
index 321974c..3d95e37 100644 (file)
--- a/program/everything/crawler.py
+++ b/program/everything/crawler.py
@@ -9,6 +9,7 @@ import re
 import sys
 import time
 import pydawg
+import buttons
 
 
 URL_REG = re.compile(
@@ -16,11 +17,8 @@ URL_REG = re.compile(
     ur'>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+'
     ur'\)))*\)|[^\s`!()\[\]{};:\'".,<>?\xab\xbb\u201c\u201d\u2018\u2019]))')
 
-REPL = [
-    ('\x01', '(?P<datum{}>.+)'),
-    ('\x02', '(?P<tijd{}>.+)'),
-    ('\x03', '(?P<wat{}>.+)'),
-    ('\x04', '(?P<waar{}>.+)')]
+REPL = [(chr(i), '(?P<{}{{}}>.+)'.format(v)) for
+        i, (_, v) in enumerate(buttons.BUTTONPAIRS, 1)]
 
 TIMES = {'m': 2628000, 'w': 604800, 'd': 3600, 'm': 60, 's': 1}
 
@@ -140,7 +138,6 @@ class Crawler():
 
     def test_entry(self, name, title, summary):
         results = {}
-        # Get regexes and match
         r_t, r_s = self.get_regex(name)
         matcht = [re.search(t, title) for t in r_t]
         matchs = [re.search(t, summary) for t in r_s]
@@ -250,6 +247,7 @@ class Crawler():
                             ename.text = raw[name]
         return et.tostring(root, encoding="us-ascii", method="xml")
 
+
 def main(argv):
     if len(argv) == 5 and argv[1] == 'test':
         cr = Crawler(init=True)

diff --git a/program/everything/index.py b/program/everything/index.py
index 05cad70..ea4cec6 100644 (file)
--- a/program/everything/index.py
+++ b/program/everything/index.py
@@ -5,6 +5,10 @@ import crawler
 import re
 import urllib
 import feedparser
+import buttons
+
+INBOXSTYLE = """height:2em;width:70em;border:1px solid#ccc;font-family:courier\
+;overflow:auto;"""
 
 
 def index(req, args, apok):
@@ -52,11 +56,13 @@ def crawler_edit(req, args, apok):
                           'td><!--cel--></tr><!--line-->').format(
                 i[0].decode('utf-8').encode('ascii', 'xmlcharrefreplace'),
                 i[1].decode('utf-8').encode('ascii', 'xmlcharrefreplace'))
+        html_feed += '</table>'
         params = {
             'rssname': args['name'],
             'url': cr.entries[args['name']]['url'],
             'input_data': input_data(cr.entries[args['name']]),
-            'feed_html': html_feed
+            'feed_html': html_feed,
+            'buttons': buttons.BUTTONS
             }
         req.write(data.format(**params))
     else:
@@ -75,35 +81,53 @@ def crawler_test(req, args, apok):
             req.write('Name not in the crawler...<br/>')
         else:
             data, log = cr.full_run(args['name'])
-            req.write('<b>Results: </b>{}/{} got results<br/>\n'.format(
+            req.write('<b>Results: </b><i>{}/{} got results</i><br/>\n'.format(
                 len(filter(None, [x[1] for x in data])), len(data)))
-            req.write('log: <div style="overflow:auto;height:5em;width:25em;bo'
-                      'rder:1px solid">{}</div>'.format(log))
-            for entry, dc in data:
-                req.write(u"""<br/><hr style="background:#000000; border:1; height:2px" />
-<b>Entry: </b>
-<div style="height:2em;width:70em;border:1px solid#ccc;font-family:courier;ove\
-rflow:auto;">
-    {title}
-</div>
-<div style="height:2em;width:70em;border:1px solid#ccc;font-family:courier;ove\
-rflow:auto;">
-{summary}
-</div><br/>
-""".format(**entry).encode('ascii', 'xmlcharrefreplace'))
-                req.write('<table>')
+            req.write("""\
+log: <div style="\
+overflow:auto;height:5em;width:50em;border:1px solid;font-family:courier\
+">\n\t{}\n</div>""".format(log))
+
+            req.write('\n<table>\n')
+            for i, (entry, dc) in enumerate(data):
+                row = ['\t<tr style="background-color:{}">\n\t\t<td>\n'.format(
+                       '#e1f5e1' if i % 2 == 0 else '#FFFFFF')]
+                row.append('\t\t\t<b>Entry: </b>\n\t\t\t<br/>')
+                row.append(u"""
+\t\t\t<div style="{inbox}">\n\t\t\t\t{title}\n\t\t\t</div>
+\t\t\t<div style="{inbox}">\n\t\t\t\t{summary}\n\t\t\t</div>
+""".format(inbox=INBOXSTYLE, **entry).encode('ascii', 'xmlcharrefreplace'))
+                row.append("""
+\t\t\t<table style="border:collapse">
+\t\t\t\t<tr>""")
                 if dc:
-                    for k, v in dc.iteritems():
-                        req.write(
-                            (u'<tr><td><b>{}</b></td><td><span style="font-fam'
-                             'ily:helvetica">{}</span></td></tr>').format(
-                                k, v).encode('ascii', 'xmlcharrefreplace'))
+                    row.append("""
+\t\t\t\t\t<td>
+\t\t\t\t\t\t<i>{}</i>
+\t\t\t\t\t</td>""".format('<br/>\n\t\t\t\t\t\t'.join(dc.keys())))
+                    row.append(u"""
+\t\t\t\t\t<td style="background-color:#FFFFFF;font-family:helvetica"><b>
+\t\t\t\t\t\t{}
+\t\t\t\t\t</b></td>\n""".format('<br/>\n'.join(
+                        dc.values())).encode('ascii', 'xmlcharrefreplace'))
+                    row.append('\t\t\t\t</tr>')
                 else:
-                    req.write('<tr><th>NO RESULTS FOUND</th></tr>')
-                req.write('</table>\n')
-        req.write('<br/><br/><a href="index.py">Go back</a>')
+                    row.append(
+                        '\t\t\t\t<td><b>NO RESULT FOUND</b></td>')
+                row.append("""
+\t\t\t</table>
+\t\t</td>
+\t</tr>
+\t<tr>
+\t\t<td>
+\t\t\t<hr style="background:#000000; border:1; height:2px" />
+\t\t</td>
+\t</tr>\n""")
+                req.write(''.join(row))
+            req.write('</table>\n')
+        req.write('<br/>\n<a href="index.py">Go back</a>')
     except Exception, e:
-        req.write(repr(e))
+        req.write(repr(e.message))
     return apok
 
 
@@ -119,7 +143,8 @@ def feed2html(url, name):
                    'cel--></tr><!--line-->').format(
             i['title'].encode('ascii', 'xmlcharrefreplace'),
             i['summary'].encode('ascii', 'xmlcharrefreplace'))
-    return result + '</table>'
+    result += '</table>'
+    return result
 
 
 def input_data(dictio):
@@ -160,10 +185,12 @@ def crawler_new(req, args, apok):
             'rssname': args['name'],
             'url': args['url'],
             'input_data': input_data({'url': args['url']}),
-            'feed_html': feed2html(args['url'], args['name'])}
+            'feed_html': feed2html(args['url'], args['name']),
+            'buttons': buttons.BUTTONS}
         req.write(data.format(**params))
     return apok
 
+
 def crawler_xml(req, args, apok):
     req.log_error('handler')
     req.content_type = 'application/xml'
@@ -171,4 +198,3 @@ def crawler_xml(req, args, apok):
     cr = crawler.Crawler()
     req.write(cr.generate_xml(**args))
     return apok
-

diff --git a/program/everything/input_app.py b/program/everything/input_app.py
index a1296b8..532e2c0 100644 (file)
--- a/program/everything/input_app.py
+++ b/program/everything/input_app.py
@@ -7,6 +7,7 @@ import index
 import crawler
 import re
 import urllib
+import buttons
 
 
 def req_pre_pos(req):
@@ -57,12 +58,9 @@ def parse_line(line):
 
 
 def create_nodes(d):
-    color_dict = {
-        'rgb(139, 0, 0)': '\x01',   # datum
-        'red': '\x02',              # tijd
-        'green': '\x03',            # wat
-        'blue': '\x04'             # wanneer
-        }
+    color_dict = {'rgb({}, {}, {})'.format(
+        int(x[1:3], 16), int(x[3:5], 16), int(x[5:], 16)): chr(i)
+        for i, (x, _) in enumerate(buttons.BUTTONPAIRS, 1)}
     line_w_match = []
 #    d['content'] = d['content'][1:]
     for i, m in enumerate(d['matchdata']):

diff --git a/program/everything/new.html.t b/program/everything/new.html.t
index 4f95a77..01379ec 100644 (file)
--- a/program/everything/new.html.t
+++ b/program/everything/new.html.t
@@ -7,10 +7,7 @@
        <table>
 {input_data}
        </table>
-       <button style="color:blue" onclick="javascript:f_waar()">Waar</button>
-       <button style="color:green" onclick="javascript:f_wat()">Wat</button>
-       <button style="color:red" onclick="javascript:f_wann_tijd()">Tijd</button>
-       <button style="color:darkred" onclick="javascript:f_wann_dat()">Datum</button>
+{buttons}
        <button onclick="javascript:f_clear()">Clear selection</button>
        <br/>Loading "{url}" as <b><p id="rssname">{rssname}</p></b><br/>
 {feed_html}

diff --git a/program/everything/scripts.js b/program/everything/scripts.js
index dfe3c24..6bac3f6 100644 (file)
--- a/program/everything/scripts.js
+++ b/program/everything/scripts.js
@@ -7,8 +7,9 @@ document.onmouseup = function mouseUp(e) {
     }
 }
 
-function stylizeHighlightedString(range, col) 
+function stylizeHighlightedString(col) 
 {
+    range = selection
     par = range.commonAncestorContainer;
     correct = 0
     while(1) {
@@ -41,6 +42,9 @@ function range_has_span(range){
         if(par == null){
             break;
         }
+        if(par.tagName == "TD"){
+            par.normalize()
+        }
         if(par.tagName == "SPAN"){
             return par;
         }
@@ -62,23 +66,6 @@ function range_has_span(range){
     }
 }
 
-
-function f_wann_tijd() {
-    stylizeHighlightedString(selection, "red");
-}
-
-function f_wann_dat() {
-    stylizeHighlightedString(selection, "darkred");
-}
-
-function f_wat() {
-    stylizeHighlightedString(selection, "green");
-}
-
-function f_waar() {
-    stylizeHighlightedString(selection, "blue");
-}
-
 function f_clear() {
     span = range_has_span(selection);
     if(span == null){

diff --git a/program/everything/todo b/program/everything/todo
index 6681f36..23654f2 100644 (file)
--- a/program/everything/todo
+++ b/program/everything/todo
@@ -1,14 +1,3 @@
 edit, clear selection
 edit, save check
-franc, wouter vraag
-tooltips voor uitleg
-
 Pubdate toevoegen als optioneel dataveld
-genre knop, knoppen toevoegen
-
-Voor preview:
-blok om en om entry grijs/groen: #DDF0FF
-input: courier
-parseerde data: verdana
-entry text wit
-css