오래된 문서 개편

app.py

@@ -396,8 +396,11 @@ app.route('/filter/extension_filter/add', methods = ['POST', 'GET'], defaults =
 app.route('/filter/extension_filter/del/<everything:name>', defaults = { 'tool' : 'extension_filter' })(filter_all_delete)
 
 # Func-list
-app.route('/list/document/old')(list_old_page)
-app.route('/list/document/old/<int:num>')(list_old_page)
+app.route('/list/document/old', defaults = { 'set_type' : 'old' })(list_old_page)
+app.route('/list/document/old/<int:num>', defaults = { 'set_type' : 'old' })(list_old_page)
+
+app.route('/list/document/new', defaults = { 'set_type' : 'new' })(list_old_page)
+app.route('/list/document/new/<int:num>', defaults = { 'set_type' : 'new' })(list_old_page)
 
 app.route('/list/document/no_link')(list_no_link)
 app.route('/list/document/no_link/<int:num>')(list_no_link)
@@ -725,8 +728,8 @@ app.route('/api/image/<everything:name>')(api_image_view)
 app.route('/api/v2/recent_edit_request/<set_type>/<int:num>', defaults = { 'db_set' : db_set_str, 'limit' : 50 })(api_list_recent_edit_request)
 app.route('/api/v2/recent_change/<set_type>/<int:num>', defaults = { 'db_set' : db_set_str, 'legacy' : '', 'limit' : 50 })(api_list_recent_change)
 app.route('/api/v2/recent_discuss/<set_type>/<int:num>', defaults = { 'db_set' : db_set_str, 'legacy' : '', 'limit' : 50 })(api_list_recent_discuss)
-app.route('/api/v2/old_page/<int:num>', defaults = { 'db_set' : db_set_str, 'set_type' : 'old' })(api_list_old_page)
-app.route('/api/v2/new_page/<int:num>', defaults = { 'db_set' : db_set_str, 'set_type' : 'new' })(api_list_old_page)
+app.route('/api/v2/list/document/old/<int:num>', defaults = { 'db_set' : db_set_str, 'set_type' : 'old' })(api_list_old_page)
+app.route('/api/v2/list/document/new/<int:num>', defaults = { 'db_set' : db_set_str, 'set_type' : 'new' })(api_list_old_page)
 
 # Func-main
 # 여기도 전반적인 조정 시행 예정

route/__init__.py

@@ -46,7 +46,6 @@ from route.list_admin_auth_use import list_admin_auth_use
 from route.list_admin_group import list_admin_group_2
 from route.list_image_file import list_image_file
 from route.list_long_page import list_long_page
-from route.list_old_page import list_old_page
 from route.list_no_link import list_no_link
 from route.list_please import list_please
 from route.list_title_index import list_title_index
@@ -166,6 +165,7 @@ from route.vote_select import vote_select
 
 from route.n_list_recent_change import list_recent_change
 from route.n_list_recent_discuss import list_recent_discuss
+from route.n_list_old_page import list_old_page
 
 from route.n_w_watch_list import w_watch_list
 

route/list_old_page.py

@@ -1,30 +0,0 @@
-from .tool.func import *
-
-def list_old_page(num = 1):
-    with get_db_connect() as conn:
-        curs = conn.cursor()
-        
-        sql_num = (num * 50 - 50) if num * 50 > 0 else 0
-        
-        div = '<ul class="opennamu_ul">'
-        
-        curs.execute(db_change("select doc_name, set_data from data_set where set_name = 'last_edit' and doc_rev = '' order by set_data asc limit ?, 50"), [sql_num])
-        n_list = curs.fetchall()
-        for data in n_list:
-            div += '<li>'
-            div += data[1] + ' | <a href="/w/' + url_pas(data[0]) + '">' + html.escape(data[0]) + '</a>'
-            
-            curs.execute(db_change("select set_data from data_set where doc_name = ? and set_name = 'doc_type'"), [data[0]])
-            db_data = curs.fetchall()
-            if db_data and db_data[0][0] != '':
-                div += ' | ' + db_data[0][0]
-
-            div += '</li>'
-        
-        div += '</ul>' + next_fix(conn, '/list/document/old/', num, n_list)
-        
-        return easy_minify(conn, flask.render_template(skin_check(conn),
-            imp = [get_lang(conn, 'old_page'), wiki_set(conn), wiki_custom(conn), wiki_css([0, 0])],
-            data = div,
-            menu = [['other', get_lang(conn, 'return')]]
-        ))

route/main_tool_other.py

@@ -28,6 +28,7 @@ def main_tool_other():
                     <li><a href="/list/document/long">''' + get_lang(conn, 'long_page') + '''</a></li>
                     <li><a href="/list/document/short">''' + get_lang(conn, 'short_page') + '''</a></li>
                     <li><a href="/list/document/old">''' + get_lang(conn, 'old_page') + '''</a></li>
+                    <li><a href="/list/document/new">''' + get_lang(conn, 'new_page') + '''</a></li>
                     <li><a href="/list/document/no_link">''' + get_lang(conn, 'no_link_document_list') + '''</a></li>
                 </ul>
                 <h3>''' + get_lang(conn, 'user') + '''</h3>

route/n_list_old_page.py

@@ -0,0 +1,19 @@
+from .tool.func import *
+
+def list_old_page(num = 1, set_type = 'old'):
+    with get_db_connect() as conn:
+        title = ''
+        if set_type == 'old':
+            title = get_lang(conn, 'old_page')
+        else:
+            title = get_lang(conn, 'new_page')
+
+        return easy_minify(conn, flask.render_template(skin_check(conn),
+            imp = [title, wiki_set(conn), wiki_custom(conn), wiki_css([0, 0])],
+            data = '' + \
+                '<div id="opennamu_list_old_page"></div>' + \
+                '<script src="/views/main_css/js/route/list_old_page.js' + cache_v() + '"></script>' + \
+                '<script>opennamu_list_old_page();</script>' + \
+            '',
+            menu = [['other', get_lang(conn, 'return')]]
+        ))

route_go/route/api_list_old_page.go

@@ -36,9 +36,9 @@ func Api_list_old_page(call_arg []string) {
 	var stmt *sql.Stmt
 
 	if other_set["set_type"] == "old" {
-		stmt, err = db.Prepare(tool.DB_change(db_set, "select doc_name, set_data from data_set where set_name = 'last_edit' and doc_rev = '' and (doc_name) in (select doc_name from data_set where set_name = 'doc_type' and set_data = '') order by set_data asc limit ?, 50"))
+		stmt, err = db.Prepare(tool.DB_change(db_set, "select doc_name, set_data from data_set where set_name = 'last_edit' and doc_rev = '' and not (doc_name) in (select doc_name from data_set where set_name = 'doc_type' and set_data != '') order by set_data asc limit ?, 50"))
 	} else {
-		stmt, err = db.Prepare(tool.DB_change(db_set, "select doc_name, set_data from data_set where set_name = 'last_edit' and doc_rev = '' and (doc_name) in (select doc_name from data_set where set_name = 'doc_type' and set_data = '') order by set_data desc limit ?, 50"))
+		stmt, err = db.Prepare(tool.DB_change(db_set, "select doc_name, set_data from data_set where set_name = 'last_edit' and doc_rev = '' and not (doc_name) in (select doc_name from data_set where set_name = 'doc_type' and set_data != '') order by set_data desc limit ?, 50"))
 	}
 
 	if err != nil {
@@ -69,19 +69,7 @@ func Api_list_old_page(call_arg []string) {
 		}
 		defer stmt.Close()
 
-		var doc_type string
-
-		err = stmt.QueryRow(doc_name).Scan(&doc_type)
-		if err != nil {
-			if err == sql.ErrNoRows {
-				doc_type = ""
-			} else {
-				log.Fatal(err)
-			}
-		}
-		defer rows.Close()
-
-		data_list = append(data_list, []string{doc_name, date, doc_type})
+		data_list = append(data_list, []string{doc_name, date})
 	}
 
 	return_data := make(map[string]interface{})

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-dev83",
+        "r_ver" : "v3.5.0-dev84",
         "c_ver" : "3500377",
         "s_ver" : "3500113"
     }

views/main_css/js/func/func.js

@@ -164,5 +164,5 @@ function opennamu_page_control(url, page, data_length, data_length_max = 50) {
         }
     };
 
-    return (next() + ' ' + back()).replace(/^ /, '');
+    return (back() + ' ' + next()).replace(/^ /, '');
 }

views/main_css/js/route/list_old_page.js

@@ -0,0 +1,43 @@
+"use strict";
+
+function opennamu_list_old_page() {
+    const url = window.location.pathname;
+    const url_split = url.split('/')
+    
+    let set_type = '';
+    let num = '';
+    if(url_split.length == 4) {
+        set_type = url_split[3];
+        num = '1';
+    } else {
+        set_type = url_split[3];
+        num = url_split[4];
+    }
+
+    fetch('/api/v2/list/document/' + set_type + '/' + num).then(function(res) {
+        return res.json();
+    }).then(function(data) {
+        data = data["data"];
+
+        let data_html = '';
+
+        for(let for_a = 0; for_a < data.length; for_a++) {
+            let doc_name = opennamu_do_url_encode(data[for_a][0]);
+
+            data_html += '<div class="opennamu_recent_change">';
+            data_html += '<a href="/w/' + doc_name + '">' + opennamu_xss_filter(data[for_a][0]) + '</a> ';
+
+            data_html += '<div style="float: right;">';
+            data_html += data[for_a][1];
+            data_html += '</div>';
+            data_html += '<div style="clear: both;"></div>';
+
+            data_html += '</div>';
+            data_html += '<hr class="main_hr">';
+        }
+
+        data_html += opennamu_page_control('/list/document/' + set_type + '/{}', Number(num), data.length);
+
+        document.getElementById('opennamu_list_old_page').innerHTML = data_html;
+    });
+}