[Hejes-devel] [871] - removed spurious dbgyik definitions from models/db.py
hejes-devel at nytud.hu
hejes-devel at nytud.hu
Fri Jul 26 19:14:19 CEST 2013
Revision: 871
Author: mihaltz
Date: 2013-07-26 19:14:18 +0200 (Fri, 26 Jul 2013)
Log Message:
-----------
- removed spurious dbgyik definitions from models/db.py
- blog: added model, controller, view; index page has basic functionality
- hqa: removed all .table and database files for deprecated gyik version
Modified Paths:
--------------
trunk/install/Makefile
trunk/misc/dbblog/test.py
trunk/web2py/applications/helyesiras_webdev/databases/sql.log
trunk/web2py/applications/helyesiras_webdev/models/db.py
trunk/web2py/applications/helyesiras_webdev/progress.log
trunk/web2py/applications/helyesiras_webdev/views/layout.html
Added Paths:
-----------
trunk/web2py/applications/helyesiras_webdev/controllers/blog.py
trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_categories.table
trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_images.table
trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_posts.table
trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_tags.table
trunk/web2py/applications/helyesiras_webdev/models/dbblog.py
trunk/web2py/applications/helyesiras_webdev/models/dbdict.py
trunk/web2py/applications/helyesiras_webdev/models/dbhqa.py
trunk/web2py/applications/helyesiras_webdev/views/blog/
trunk/web2py/applications/helyesiras_webdev/views/blog/index.html
trunk/web2py/applications/helyesiras_webdev/views/blog/show.html
Removed Paths:
-------------
trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_other_remarks.table
trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_problem_categories.table
trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_prof_categories.table
trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_queries.table
trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_query_prof_category.table
trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_query_remark.table
trunk/web2py/applications/helyesiras_webdev/databases/dbgyik.db
Modified: trunk/install/Makefile
===================================================================
--- trunk/install/Makefile 2013-07-26 13:52:39 UTC (rev 870)
+++ trunk/install/Makefile 2013-07-26 17:14:18 UTC (rev 871)
@@ -50,12 +50,13 @@
sudo svn export --force ../bin /home/projects/helyesiras/bin
sudo svn export --force ../lib /home/projects/helyesiras/lib
-install_mysqldb:
- sudo apt-get install python-mysqldb
-
# Install required .deb packages
install_packages:
sudo apt-get install hunspell hunspell-hu memcached
+# Install package required by trunk/misc/osiris_xml/ohanalyze.py
+install_mysqldb:
+ sudo apt-get install python-mysqldb
+
# Install web2py_src.zip to /opt/web2py
# TODO
Modified: trunk/misc/dbblog/test.py
===================================================================
--- trunk/misc/dbblog/test.py 2013-07-26 13:52:39 UTC (rev 870)
+++ trunk/misc/dbblog/test.py 2013-07-26 17:14:18 UTC (rev 871)
@@ -94,32 +94,65 @@
def add_test_data():
db.categories.bulk_insert([{'name': 'Hírek'}, {'name': 'Közönségszolgálat'}, {'name': 'Helyesírási érdekességek'}])
+ db.tags.bulk_insert([{'name': 'Új verzió'}, {'name': 'Hibajavítás'}, {'name': 'Különírás-egybeírás'}, {'name': 'Teszt'}])
+ now = datetime.datetime.now()
db.posts.insert(
slug='elindult-a-blog',
title='Elindult a blog',
body='#Elindult a blog\n\nEnnek *nagyon* örülünk.',
- created_on=datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
- category=db.categories(name='Hírek').id
+ created_on=now.strftime('%Y-%m-%d %H:%M:%S'),
+ category=db.categories(name='Hírek').id,
+ tags=[db.tags(name='Új verzió').id]
)
db.posts.insert(
slug='teszt-bejegyzes',
title='Teszt bejegyzés',
body='Ez egy teszt bejegyzés.',
- created_on=datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
- category=db.categories(name='Közönségszolgálat').id
+ created_on=(now + datetime.timedelta(minutes=1)).strftime('%Y-%m-%d %H:%M:%S'),
+ category=db.categories(name='Közönségszolgálat').id,
+ tags=[db.tags(name='Teszt').id]
)
db.posts.insert(
slug='teszt-bejegyzes-2',
title='Teszt bejegyzés 2',
body='Ez is egy teszt bejegyzés.',
- created_on=datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
- category=db.categories(name='Helyesírási érdekességek').id
+ created_on=(now + datetime.timedelta(minutes=2)).strftime('%Y-%m-%d %H:%M:%S'),
+ category=db.categories(name='Helyesírási érdekességek').id,
+ tags=[db.tags(name='Teszt').id, db.tags(name='Különírás-egybeírás').id]
)
+ db.posts.insert(
+ slug='fekete-rigo-sarga-rigo',
+ title='Fekete, sárga: rigó?',
+ body='Hogy kell írni őket? Olvasson tovább, kiderül.',
+ created_on=(now + datetime.timedelta(minutes=3)).strftime('%Y-%m-%d %H:%M:%S'),
+ category=db.categories(name='Helyesírási érdekességek').id,
+ tags=[db.tags(name='Teszt').id, db.tags(name='Különírás-egybeírás').id]
+ )
db.commit()
+def some_test():
+ print(db(db.categories.name=='Szolgálati közlemények').select()[0].id)
+ print(db.categories(name='Szolgálati közlemények').id)
+def query_categories():
+ rows = db().select(db.categories.ALL, orderby=db.categories.id)
+ for row in rows:
+ print('{0}: {1}'.format(row['id'], row['name']))
+
+
+def query_posts():
+ rows = db(db.posts.category==db.categories.id).select(orderby=~db.posts.created_on, limitby=(0, 5))
+ for row in rows:
+ #print row
+ print(row.posts['title'], row.categories['name'])
+
+
+
+
+
+
# LEGACY:
@@ -293,38 +326,17 @@
print '\t'.join([str(x) for x in d])
-# main
-define_tables()
-create_indexes()
-add_test_data()
-#print(db(db.categories.name=='Szolgálati közlemények').select()[0].id)
-#print(db.categories(name='Szolgálati közlemények').id)
+#########
+# main
+#########
-#dropdb()
+define_tables()
+#create_indexes()
+#add_test_data()
+#query_categories()
+query_posts()
-#dump_tables()
-#test_add_data()
-#test_query0()
-#test_query1()
-#db.commit()
-#test_query2()
-#test_query4()
-#test_query5()
-#db.commit()
-#test_update()
-#test_query7()
-#test_query8()
-#import_csv_data()
-
-#test_query8()
-#test_query9()
-#test_query10()
-
-#dump_main()
-
-
-
Added: trunk/web2py/applications/helyesiras_webdev/controllers/blog.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/controllers/blog.py (rev 0)
+++ trunk/web2py/applications/helyesiras_webdev/controllers/blog.py 2013-07-26 17:14:18 UTC (rev 871)
@@ -0,0 +1,26 @@
+# coding: utf8
+
+"""
+Controller for the blog pages
+ at author MM
+"""
+
+def index():
+ """Starting page for the blog.
+ returns following keys:
+ posts: Rows object with most recent 5 blog posts
+ categories: Rows object with category names and ids
+ tags: Rows object with tag names and ids
+ TODO:
+ check GET vars (category, tag(s?)) and filter posts accordingly
+ """
+ cats = dbblog().select(dbblog.categories.ALL, orderby=dbblog.categories.id)
+ tags = dbblog().select(dbblog.tags.ALL, orderby=dbblog.tags.name)
+ posts = dbblog(dbblog.posts.category==dbblog.categories.id).select(orderby=~dbblog.posts.created_on, limitby=(0, 5))
+ return dict(categories=cats, tags=tags, posts=posts)
+
+def show():
+ """Show a selected blog post.
+ TODO
+ """
+ return dict()
Added: trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_categories.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_categories.table (rev 0)
+++ trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_categories.table 2013-07-26 17:14:18 UTC (rev 871)
@@ -0,0 +1,41 @@
+(dp1
+S'id'
+p2
+(dp3
+S'length'
+p4
+I255
+sS'unique'
+p5
+I00
+sS'sortable'
+p6
+I1
+sS'sql'
+p7
+S'INT AUTO_INCREMENT NOT NULL'
+p8
+sS'notnull'
+p9
+I00
+sS'type'
+p10
+g2
+ssS'name'
+p11
+(dp12
+g4
+I255
+sg5
+I01
+sg6
+I2
+sg7
+S'VARCHAR(255) UNIQUE'
+p13
+sg9
+I00
+sg10
+S'string'
+p14
+ss.
\ No newline at end of file
Added: trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_images.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_images.table (rev 0)
+++ trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_images.table 2013-07-26 17:14:18 UTC (rev 871)
@@ -0,0 +1,58 @@
+(dp1
+S'id'
+p2
+(dp3
+S'length'
+p4
+I255
+sS'unique'
+p5
+I00
+sS'sortable'
+p6
+I1
+sS'sql'
+p7
+S'INT AUTO_INCREMENT NOT NULL'
+p8
+sS'notnull'
+p9
+I00
+sS'type'
+p10
+g2
+ssS'file'
+p11
+(dp12
+g4
+I255
+sg5
+I00
+sg6
+I2
+sg7
+S'VARCHAR(255)'
+p13
+sg9
+I00
+sg10
+S'upload'
+p14
+ssS'title'
+p15
+(dp16
+g4
+I255
+sg5
+I01
+sg6
+I3
+sg7
+S'VARCHAR(255) UNIQUE'
+p17
+sg9
+I00
+sg10
+S'string'
+p18
+ss.
\ No newline at end of file
Added: trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_posts.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_posts.table (rev 0)
+++ trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_posts.table 2013-07-26 17:14:18 UTC (rev 871)
@@ -0,0 +1,142 @@
+(dp1
+S'body'
+p2
+(dp3
+S'length'
+p4
+I32768
+sS'unique'
+p5
+I00
+sS'sortable'
+p6
+I5
+sS'sql'
+p7
+S'LONGTEXT'
+p8
+sS'notnull'
+p9
+I00
+sS'type'
+p10
+S'text'
+p11
+ssS'category'
+p12
+(dp13
+g4
+I255
+sg5
+I00
+sg6
+I7
+sg7
+S'INT, INDEX category__idx (category), FOREIGN KEY (category) REFERENCES categories (id) ON DELETE CASCADE'
+p14
+sg9
+I00
+sg10
+S'reference categories'
+p15
+ssS'title'
+p16
+(dp17
+g4
+I255
+sg5
+I00
+sg6
+I3
+sg7
+S'VARCHAR(255)'
+p18
+sg9
+I00
+sg10
+S'string'
+p19
+ssS'image'
+p20
+(dp21
+g4
+I255
+sg5
+I00
+sg6
+I4
+sg7
+S'INT, INDEX image__idx (image), FOREIGN KEY (image) REFERENCES images (id) ON DELETE CASCADE'
+p22
+sg9
+I00
+sg10
+S'reference images'
+p23
+ssS'tags'
+p24
+(dp25
+g4
+I255
+sg5
+I00
+sg6
+I6
+sg7
+S'LONGTEXT'
+p26
+sg9
+I00
+sg10
+S'list:reference tags'
+p27
+ssS'slug'
+p28
+(dp29
+g4
+I255
+sg5
+I01
+sg6
+I2
+sg7
+S'VARCHAR(255) UNIQUE'
+p30
+sg9
+I00
+sg10
+g19
+ssS'created_on'
+p31
+(dp32
+g4
+I255
+sg5
+I00
+sg6
+I8
+sg7
+S'DATETIME'
+p33
+sg9
+I00
+sg10
+S'datetime'
+p34
+ssS'id'
+p35
+(dp36
+g4
+I255
+sg5
+I00
+sg6
+I1
+sg7
+S'INT AUTO_INCREMENT NOT NULL'
+p37
+sg9
+I00
+sg10
+g35
+ss.
\ No newline at end of file
Added: trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_tags.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_tags.table (rev 0)
+++ trunk/web2py/applications/helyesiras_webdev/databases/12731f961fce6b1f660fb9156944086a_tags.table 2013-07-26 17:14:18 UTC (rev 871)
@@ -0,0 +1,41 @@
+(dp1
+S'id'
+p2
+(dp3
+S'length'
+p4
+I255
+sS'unique'
+p5
+I00
+sS'sortable'
+p6
+I1
+sS'sql'
+p7
+S'INT AUTO_INCREMENT NOT NULL'
+p8
+sS'notnull'
+p9
+I00
+sS'type'
+p10
+g2
+ssS'name'
+p11
+(dp12
+g4
+I255
+sg5
+I01
+sg6
+I2
+sg7
+S'VARCHAR(255) UNIQUE'
+p13
+sg9
+I00
+sg10
+S'string'
+p14
+ss.
\ No newline at end of file
Deleted: trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_other_remarks.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_other_remarks.table 2013-07-26 13::52:39 UTC (rev 870)
+++ trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_other_remarks.table 2013-07-26 17:14:18 UTC (rev 871)
@@ -1,90 +0,0 @@
-(dp1
-S'jelzes'
-p2
-(dp3
-S'length'
-p4
-I512
-sS'unique'
-p5
-I00
-sS'sortable'
-p6
-I4
-sS'sql'
-p7
-S'CHAR(512)'
-p8
-sS'notnull'
-p9
-I00
-sS'type'
-p10
-S'string'
-p11
-ssS'id2'
-p12
-(dp13
-g4
-I512
-sg5
-I00
-sg6
-I2
-sg7
-S'CHAR(512)'
-p14
-sg9
-I00
-sg10
-g11
-ssS'id'
-p15
-(dp16
-g4
-I512
-sg5
-I00
-sg6
-I1
-sg7
-S'INTEGER PRIMARY KEY AUTOINCREMENT'
-p17
-sg9
-I00
-sg10
-S'id'
-p18
-ssS'megjegyzes'
-p19
-(dp20
-g4
-I512
-sg5
-I00
-sg6
-I5
-sg7
-S'CHAR(512)'
-p21
-sg9
-I00
-sg10
-g11
-ssS'jelzes_rov'
-p22
-(dp23
-g4
-I512
-sg5
-I00
-sg6
-I3
-sg7
-S'CHAR(512)'
-p24
-sg9
-I00
-sg10
-g11
-ss.
\ No newline at end of file
Deleted: trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_problem_categories.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_problem_categories.table 2013-07-226 13:52:39 UTC (rev 870)
+++ trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_problem_categories.table 2013-07-26 17:14:18 UTC (rev 871)
@@ -1,74 +0,0 @@
-(dp1
-S'kategoria'
-p2
-(dp3
-S'length'
-p4
-I512
-sS'unique'
-p5
-I00
-sS'sortable'
-p6
-I3
-sS'sql'
-p7
-S'CHAR(512)'
-p8
-sS'notnull'
-p9
-I00
-sS'type'
-p10
-S'string'
-p11
-ssS'id2'
-p12
-(dp13
-g4
-I512
-sg5
-I00
-sg6
-I2
-sg7
-S'CHAR(512)'
-p14
-sg9
-I00
-sg10
-g11
-ssS'id'
-p15
-(dp16
-g4
-I512
-sg5
-I00
-sg6
-I1
-sg7
-S'INTEGER PRIMARY KEY AUTOINCREMENT'
-p17
-sg9
-I00
-sg10
-S'id'
-p18
-ssS'megjegyzes'
-p19
-(dp20
-g4
-I512
-sg5
-I00
-sg6
-I4
-sg7
-S'CHAR(512)'
-p21
-sg9
-I00
-sg10
-g11
-ss.
\ No newline at end of file
Deleted: trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_prof_categories.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_prof_categories.table 2013-07-26 113:52:39 UTC (rev 870)
+++ trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_prof_categories.table 2013-07-26 17:14:18 UTC (rev 871)
@@ -1,74 +0,0 @@
-(dp1
-S'szakmai_besorolas_rov'
-p2
-(dp3
-S'length'
-p4
-I512
-sS'unique'
-p5
-I00
-sS'sortable'
-p6
-I3
-sS'sql'
-p7
-S'CHAR(512)'
-p8
-sS'notnull'
-p9
-I00
-sS'type'
-p10
-S'string'
-p11
-ssS'id2'
-p12
-(dp13
-g4
-I512
-sg5
-I00
-sg6
-I2
-sg7
-S'CHAR(512)'
-p14
-sg9
-I00
-sg10
-g11
-ssS'id'
-p15
-(dp16
-g4
-I512
-sg5
-I00
-sg6
-I1
-sg7
-S'INTEGER PRIMARY KEY AUTOINCREMENT'
-p17
-sg9
-I00
-sg10
-S'id'
-p18
-ssS'szakmai_besorolas'
-p19
-(dp20
-g4
-I512
-sg5
-I00
-sg6
-I4
-sg7
-S'CHAR(512)'
-p21
-sg9
-I00
-sg10
-g11
-ss.
\ No newline at end of file
Deleted: trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_queries.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_queries.table 2013-07-26 13:52:39 UTC (rev 870)
+++ trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_queries.table 2013-07-26 17:14:18 UTC (rev 871)
@@ -1,122 +0,0 @@
-(dp1
-S'problema_kategoria'
-p2
-(dp3
-S'length'
-p4
-I512
-sS'unique'
-p5
-I00
-sS'sortable'
-p6
-I6
-sS'sql'
-p7
-S'CHAR(512)'
-p8
-sS'notnull'
-p9
-I00
-sS'type'
-p10
-S'string'
-p11
-ssS'akh'
-p12
-(dp13
-g4
-I512
-sg5
-I00
-sg6
-I7
-sg7
-S'CHAR(512)'
-p14
-sg9
-I00
-sg10
-g11
-ssS'valasz'
-p15
-(dp16
-g4
-I512
-sg5
-I00
-sg6
-I5
-sg7
-S'CHAR(512)'
-p17
-sg9
-I00
-sg10
-g11
-ssS'kerdes'
-p18
-(dp19
-g4
-I512
-sg5
-I00
-sg6
-I4
-sg7
-S'CHAR(512)'
-p20
-sg9
-I00
-sg10
-g11
-ssS'kerdeses_szo'
-p21
-(dp22
-g4
-I512
-sg5
-I00
-sg6
-I3
-sg7
-S'CHAR(512)'
-p23
-sg9
-I00
-sg10
-g11
-ssS'id2'
-p24
-(dp25
-g4
-I512
-sg5
-I00
-sg6
-I2
-sg7
-S'CHAR(512)'
-p26
-sg9
-I00
-sg10
-g11
-ssS'id'
-p27
-(dp28
-g4
-I512
-sg5
-I00
-sg6
-I1
-sg7
-S'INTEGER PRIMARY KEY AUTOINCREMENT'
-p29
-sg9
-I00
-sg10
-S'id'
-p30
-ss.
\ No newline at end of file
Deleted: trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_query_prof_category.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_query_prof_category.table 2013-07--26 13:52:39 UTC (rev 870)
+++ trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_query_prof_category.table 2013-07-26 17:14:18 UTC (rev 871)
@@ -1,58 +0,0 @@
-(dp1
-S'prof_category_id'
-p2
-(dp3
-S'length'
-p4
-I512
-sS'unique'
-p5
-I00
-sS'sortable'
-p6
-I3
-sS'sql'
-p7
-S'CHAR(512)'
-p8
-sS'notnull'
-p9
-I00
-sS'type'
-p10
-S'string'
-p11
-ssS'query_id'
-p12
-(dp13
-g4
-I512
-sg5
-I00
-sg6
-I2
-sg7
-S'CHAR(512)'
-p14
-sg9
-I00
-sg10
-g11
-ssS'id'
-p15
-(dp16
-g4
-I512
-sg5
-I00
-sg6
-I1
-sg7
-S'INTEGER PRIMARY KEY AUTOINCREMENT'
-p17
-sg9
-I00
-sg10
-S'id'
-p18
-ss.
\ No newline at end of file
Deleted: trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_query_remark.table
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_query_remark.table 2013-07-26 13:552:39 UTC (rev 870)
+++ trunk/web2py/applications/helyesiras_webdev/databases/d968f3e98c63a9cc2bdcbfe295b33244_query_remark.table 2013-07-26 17:14:18 UTC (rev 871)
@@ -1,58 +0,0 @@
-(dp1
-S'other_remark_id'
-p2
-(dp3
-S'length'
-p4
-I512
-sS'unique'
-p5
-I00
-sS'sortable'
-p6
-I3
-sS'sql'
-p7
-S'CHAR(512)'
-p8
-sS'notnull'
-p9
-I00
-sS'type'
-p10
-S'string'
-p11
-ssS'query_id'
-p12
-(dp13
-g4
-I512
-sg5
-I00
-sg6
-I2
-sg7
-S'CHAR(512)'
-p14
-sg9
-I00
-sg10
-g11
-ssS'id'
-p15
-(dp16
-g4
-I512
-sg5
-I00
-sg6
-I1
-sg7
-S'INTEGER PRIMARY KEY AUTOINCREMENT'
-p17
-sg9
-I00
-sg10
-S'id'
-p18
-ss.
\ No newline at end of file
Deleted: trunk/web2py/applications/helyesiras_webdev/databases/dbgyik.db
===================================================================
(Binary files differ)
Modified: trunk/web2py/applications/helyesiras_webdev/databases/sql.log
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/databases/sql.log 2013-07-26 13:52:39 UTC (rev 870)
+++ trunk/web2py/applications/helyesiras_webdev/databases/sql.log 2013-07-26 17:14:18 UTC (rev 871)
@@ -48,3 +48,80 @@
megjegyzes CHAR(512)
);
success!
+timestamp: 2013-07-26T16:00:30.309634
+CREATE TABLE images(
+ id INT AUTO_INCREMENT NOT NULL,
+ file VARCHAR(255),
+ title VARCHAR(255) UNIQUE,
+ PRIMARY KEY(id)
+) ENGINE=InnoDB CHARACTER SET utf8;
+timestamp: 2013-07-26T16:02:00.330574
+CREATE TABLE images(
+ id INT AUTO_INCREMENT NOT NULL,
+ file VARCHAR(255),
+ title VARCHAR(255) UNIQUE,
+ PRIMARY KEY(id)
+) ENGINE=InnoDB CHARACTER SET utf8;
+success!
+timestamp: 2013-07-26T16:02:00.356293
+CREATE TABLE tags(
+ id INT AUTO_INCREMENT NOT NULL,
+ name VARCHAR(255) UNIQUE,
+ PRIMARY KEY(id)
+) ENGINE=InnoDB CHARACTER SET utf8;
+success!
+timestamp: 2013-07-26T16:02:00.381256
+CREATE TABLE categories(
+ id INT AUTO_INCREMENT NOT NULL,
+ name VARCHAR(255) UNIQUE,
+ PRIMARY KEY(id)
+) ENGINE=InnoDB CHARACTER SET utf8;
+success!
+timestamp: 2013-07-26T16:02:00.387060
+CREATE TABLE posts(
+ id INT AUTO_INCREMENT NOT NULL,
+ slug VARCHAR(255) UNIQUE,
+ title VARCHAR(255),
+ image INT, INDEX image__idx (image), FOREIGN KEY (image) REFERENCES images (id) ON DELETE CASCADE,
+ body LONGTEXT,
+ tags LONGTEXT,
+ category INT, INDEX category__idx (category), FOREIGN KEY (category) REFERENCES categories (id) ON DELETE CASCADE,
+ created_on DATETIME,
+ PRIMARY KEY(id)
+) ENGINE=InnoDB CHARACTER SET utf8;
+success!
+timestamp: 2013-07-26T18:14:08.738370
+CREATE TABLE images(
+ id INT AUTO_INCREMENT NOT NULL,
+ file VARCHAR(255),
+ title VARCHAR(255) UNIQUE,
+ PRIMARY KEY(id)
+) ENGINE=InnoDB CHARACTER SET utf8;
+success!
+timestamp: 2013-07-26T18:14:08.810763
+CREATE TABLE tags(
+ id INT AUTO_INCREMENT NOT NULL,
+ name VARCHAR(255) UNIQUE,
+ PRIMARY KEY(id)
+) ENGINE=InnoDB CHARACTER SET utf8;
+success!
+timestamp: 2013-07-26T18:14:08.861272
+CREATE TABLE categories(
+ id INT AUTO_INCREMENT NOT NULL,
+ name VARCHAR(255) UNIQUE,
+ PRIMARY KEY(id)
+) ENGINE=InnoDB CHARACTER SET utf8;
+success!
+timestamp: 2013-07-26T18:14:08.867740
+CREATE TABLE posts(
+ id INT AUTO_INCREMENT NOT NULL,
+ slug VARCHAR(255) UNIQUE,
+ title VARCHAR(255),
+ image INT, INDEX image__idx (image), FOREIGN KEY (image) REFERENCES images (id) ON DELETE CASCADE,
+ body LONGTEXT,
+ tags LONGTEXT,
+ category INT, INDEX category__idx (category), FOREIGN KEY (category) REFERENCES categories (id) ON DELETE CASCADE,
+ created_on DATETIME,
+ PRIMARY KEY(id)
+) ENGINE=InnoDB CHARACTER SET utf8;
+success!
Modified: trunk/web2py/applications/helyesiras_webdev/models/db.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/models/db.py 2013-07-26 13:52:39 UTC (rev 870)
+++ trunk/web2py/applications/helyesiras_webdev/models/db.py 2013-07-26 17:14:18 UTC (rev 871)
@@ -76,48 +76,3 @@
-# DBDICTER database in MySQL
-dbdict = DAL('mysql://dbdicter:dbdicter123@localhost/dbdict', migrate_enabled=False)
-
-# DBGYIK database in SQLite (databases/dbgyik.db)
-dbgyik = DAL("sqlite://dbgyik.db")
-
-dbgyik.define_table('queries', Field('id2'), Field('kerdeses_szo'), Field('kerdes'), Field('valasz'), Field('problema_kategoria'), Field('akh'))
-
-dbgyik.define_table('problem_categories', Field('id2'), Field('kategoria'), Field('megjegyzes'))
-
-dbgyik.define_table('query_remark', Field('query_id'), Field('other_remark_id'))
-
-dbgyik.define_table('query_prof_category', Field('query_id'), Field('prof_category_id'))
-
-dbgyik.define_table('prof_categories', Field('id2'), Field('szakmai_besorolas_rov'), Field('szakmai_besorolas'))
-
-dbgyik.define_table('other_remarks', Field('id2'), Field('jelzes_rov'), Field('jelzes'), Field('megjegyzes'))
-
-# DBHQA (v.2 of DBGYIK) in SQLite (databases/hqa.db, hqa_*.table)
-dbhqa = DAL("sqlite://hqa.db")
-
-dbhqa.define_table('hqa_main',
- Field('qword'),
- Field('question'),
- Field('answer'),
- Field('prob_cat_id', 'reference hqa_prob_cat_names'),
- Field('prof_cat_ids', 'list:reference hqa_prof_cat_names'),
- Field('remark_ids', 'list:reference hqa_remark_names'),
- Field('akh'),
- migrate='hqa_main.table')
-
-dbhqa.define_table('hqa_prob_cat_names',
- Field('name'),
- format='%(name)s',
- migrate='hqa_prob_cat_names.table')
-
-dbhqa.define_table('hqa_prof_cat_names',
- Field('name'),
- format='%(name)s',
- migrate='hqa_prof_cat_names.table')
-
-dbhqa.define_table('hqa_remark_names',
- Field('name'),
- format='%(name)s',
- migrate='hqa_remark_names.table')
Added: trunk/web2py/applications/helyesiras_webdev/models/dbblog.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/models/dbblog.py (rev 0)
+++ trunk/web2py/applications/helyesiras_webdev/models/dbblog.py 2013-07-26 17:14:18 UTC (rev 871)
@@ -0,0 +1,62 @@
+# coding: utf8
+
+"""
+Data model for dbhelyesblog (MySQL database for the blog feature)
+"""
+
+
+def create_index_if_not_exists(db, table, keyname, column, unique=False):
+ """Check if index keyname on db.table.column exists.
+ If not, execute sql statement 'CREATE (UNIQUE) INDEX...' and return True, otherwise return False.
+ Note: db.table must exist, otherwise an exception is raised.
+ """
+ rows = db.executesql('SHOW INDEXES IN `{0}`;'.format(table), as_dict=True)
+ for row in rows:
+ if row['Key_name'] == unicode(keyname, 'utf8') and row['Column_name'] == unicode(column, 'utf8'):
+ return False
+ db.executesql('CREATE {0}INDEX {1} ON `{2}` ({3});'.format('UNIQUE ' if unique else '', keyname, table, column))
+ return True
+
+
+# Connection to the database (admin)
+dbblog = DAL("mysql://dbblogadmin:d4bl0GGr@localhost/dbhelyesblog")
+
+
+# Define the table names and the fields + add restrictions.
+dbblog.define_table('images',
+ Field('file', 'upload'),
+ Field('title', unique=True)
+ )
+
+dbblog.define_table('tags',
+ Field('name', unique=True)
+ )
+
+dbblog.define_table('categories',
+ Field('name', unique=True)
+ )
+
+dbblog.define_table('posts',
+ Field('slug', unique=True),
+ Field('title'),
+ Field('image', 'reference images'),
+ Field('body', 'text'),
+ Field('tags', 'list:reference tags'),
+ Field('category', 'reference categories'),
+ Field('created_on', 'datetime', default=request.now)
+ )
+
+dbblog.posts.slug.requires = IS_NOT_EMPTY()
+dbblog.posts.title.requires = IS_NOT_EMPTY()
+dbblog.posts.body.requires = IS_NOT_EMPTY()
+dbblog.posts.slug.requires = IS_NOT_EMPTY()
+dbblog.posts.image.requires = IS_IN_DB(dbblog, dbblog.images.id, '%(title)s')
+
+dbblog.commit()
+
+# Create indexes (indices?) (if they didn't exist)
+create_index_if_not_exists(dbblog, 'images', 'idx_images_title', 'title', True)
+create_index_if_not_exists(dbblog, 'tags', 'idx_tags_name', 'name', True)
+create_index_if_not_exists(dbblog, 'categories', 'idx_categories_name', 'name', True)
+create_index_if_not_exists(dbblog, 'posts', 'idx_posts_created_on', 'created_on')
+
Added: trunk/web2py/applications/helyesiras_webdev/models/dbdict.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/models/dbdict.py (rev 0)
+++ trunk/web2py/applications/helyesiras_webdev/models/dbdict.py 2013-07-26 17:14:18 UTC (rev 871)
@@ -0,0 +1,5 @@
+# coding: utf8
+
+# DBDICTER database in MySQL
+dbdict = DAL('mysql://dbdicter:dbdicter123@localhost/dbdict', migrate_enabled=False)
+
Added: trunk/web2py/applications/helyesiras_webdev/models/dbhqa.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/models/dbhqa.py (rev 0)
+++ trunk/web2py/applications/helyesiras_webdev/models/dbhqa.py 2013-07-26 17:14:18 UTC (rev 871)
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+"""
+DBHQA (v.2 of DBGYIK) in SQLite (databases/hqa.db, hqa_*.table)
+ at author MM
+"""
+
+dbhqa = DAL("sqlite://hqa.db")
+
+dbhqa.define_table('hqa_main',
+ Field('qword'),
+ Field('question'),
+ Field('answer'),
+ Field('prob_cat_id', 'reference hqa_prob_cat_names'),
+ Field('prof_cat_ids', 'list:reference hqa_prof_cat_names'),
+ Field('remark_ids', 'list:reference hqa_remark_names'),
+ Field('akh'),
+ migrate='hqa_main.table')
+
+dbhqa.define_table('hqa_prob_cat_names',
+ Field('name'),
+ format='%(name)s',
+ migrate='hqa_prob_cat_names.table')
+
+dbhqa.define_table('hqa_prof_cat_names',
+ Field('name'),
+ format='%(name)s',
+ migrate='hqa_prof_cat_names.table')
+
+dbhqa.define_table('hqa_remark_names',
+ Field('name'),
+ format='%(name)s',
+ migrate='hqa_remark_names.table')
+
+
Modified: trunk/web2py/applications/helyesiras_webdev/progress.log
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/progress.log 2013-07-26 13:52:39 UTC (rev 870)
+++ trunk/web2py/applications/helyesiras_webdev/progress.log 2013-07-26 17:14:18 UTC (rev 871)
@@ -278,3 +278,18 @@
[2013-07-12 15:27:33] EDIT helyesiras_webdev/static/content/widget2.html: 0
[2013-07-12 15:27:42] EDIT helyesiras_webdev/static/content/widget2.html: 0
[2013-07-12 15:28:06] EDIT helyesiras_webdev/static/content/widget2.html: 0
+[2013-07-26 15:54:50] EDIT helyesiras_webdev/models/db.py: -8
+[2013-07-26 15:55:59] CREATE dbblog.py: 0
+[2013-07-26 15:56:04] EDIT helyesiras_webdev/models/dbblog.py: 0
+[2013-07-26 15:57:56] EDIT helyesiras_webdev/models/dbblog.py: 31
+[2013-07-26 15:58:06] EDIT helyesiras_webdev/models/dbblog.py: 1
+[2013-07-26 15:58:32] EDIT helyesiras_webdev/models/dbblog.py: 1
+[2013-07-26 16:50:00] CREATE blog.py: 0
+[2013-07-26 16:50:41] EDIT helyesiras_webdev/controllers/blog.py: 3
+[2013-07-26 16:50:47] EDIT helyesiras_webdev/controllers/blog.py: 0
+[2013-07-26 16:51:09] EDIT helyesiras_webdev/controllers/blog.py: 4
+[2013-07-26 16:51:12] EDIT helyesiras_webdev/controllers/blog.py: 0
+[2013-07-26 16:51:50] CREATE blog/index.html: 0
+[2013-07-26 16:51:57] EDIT helyesiras_webdev/views/blog/index.html: 0
+[2013-07-26 16:52:17] CREATE blog/show.html: 0
+[2013-07-26 16:52:21] EDIT helyesiras_webdev/views/blog/show.html: 0
Added: trunk/web2py/applications/helyesiras_webdev/views/blog/index.html
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/views/blog/index.html (rev 0)
+++ trunk/web2py/applications/helyesiras_webdev/views/blog/index.html 2013-07-26 17:14:18 UTC (rev 871)
@@ -0,0 +1,32 @@
+{{extend 'layout.html'}}
+
+
+{{block blog_sidebar-first}}
+ <div>Rovatok</div>
+ {{for row in categories:}}
+ <div>{{=A(row['name'], _href=URL(c='blog', vars={'category': row['id']}))}}</div>
+ {{pass}}
+ <div>Címkék</div>
+ {{for row in tags:}}
+ <div>{{=A(row['name'], _href=URL(c='blog', vars={'tag': row['name']}))}}</div>
+ {{pass}}
+{{end}}
+
+
+{{=response.toolbar()}}
+
+<h1>Blog</h1>
+
+{{for i, post in enumerate(posts):}}
+ <div>
+ <div>{{=post.categories['name']}}</div>
+ <div>{{=post.posts['title']}}</div>
+ <div>{{=post.posts['created_on']}}</div>
+ <div>{{=post.posts['body']}}</div>
+ <div>{{=A('Tovább', _href=URL())}}</div>
+ </div>
+ {{if i < len(posts) - 1:}}
+ <p>---------------</p>
+ {{pass}}
+{{pass}}
+
Added: trunk/web2py/applications/helyesiras_webdev/views/blog/show.html
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/views/blog/show.html (rev 0)
+++ trunk/web2py/applications/helyesiras_webdev/views/blog/show.html 2013-07-26 17:14:18 UTC (rev 871)
@@ -0,0 +1,5 @@
+{{extend 'layout.html'}}
+
+<h1>This is the blog/show.html template</h1>
+
+{{=BEAUTIFY(response._vars)}}
Modified: trunk/web2py/applications/helyesiras_webdev/views/layout.html
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/views/layout.html 2013-07-26 13:52:39 UTC (rev 870)
+++ trunk/web2py/applications/helyesiras_webdev/views/layout.html 2013-07-26 17:14:18 UTC (rev 871)
@@ -137,9 +137,9 @@
</div></div><!-- statusbar -->
<div id="page"{{if request.function=='index':}} class="front"{{pass}}><div class="wrapper"> <!-- Here my central body -->
-{{if request.function not in ['index']:}}
+{{if not (request.controller == 'default' and request.function == 'index'):}}
<div id="sidebar-first">
-{{if request.function not in ['akh', 'gyik', 'hqa', 'howitworks']:}}
+{{if request.controller == 'default' and request.function not in ['akh', 'gyik', 'hqa', 'howitworks']:}}
<ul>
<li class="first link1{{if request.function=='kulegy':}} active{{pass}}">{{=A("Külön vagy egybe?", _href=URL(c="default", f="kulegy"), _alt="Külön vagy egybe?")}}</li>
<li class="link2{{if request.function=='suggest':}} active{{pass}}">{{=A("Helyes-e így?", _href=URL(c="default", f="suggest"), _alt="Helyes-e így?")}}</li>
@@ -166,6 +166,10 @@
{{block gyik_sidebar-first}}
{{end}}
{{pass}}
+{{if request.controller == 'blog':}}
+ {{block blog_sidebar-first}}
+ {{end}}
+{{pass}}
{{if request.function == 'akh':}}
<p class="tartfofejezet"><a href="#F1">ÁLTALÁNOS TUDNIVALÓK</a></p>
<div class="sub">
More information about the Hejes-devel
mailing list