issue #20 download all rows fixed

Author: bbrand84

static/js/common.js

@@ -2509,7 +2509,7 @@ $( document ).ready(function() {
 	});
 });
 
-function model_to_table(model){
+function model_to_table(model, numrows){
 
 	var tbl = jQuery('<table/>', {
 		class: "rdf_table"
@@ -2522,9 +2522,10 @@ function model_to_table(model){
 
 	var rdf_array = model_to_array(model);
 
+	numrows = typeof numrows === "undefined" ? rdf_array.length : (numrows*model['columns'].length)
 
 	//create table content
-	for(var i = 0; i < rdf_array.length; i++){
+	for(var i = 0; i < numrows; i++){
 
 			var tr = jQuery('<tr/>', {});
 			for(var j = 0; j < 3; j++){

templates/transformation/csv_enrich.html

@@ -52,16 +52,14 @@ <h3>Enrich the RDF graph</h3>
     <div class="content scrollit">
         <h3>DATA VIEW</h3>
         <div>
-        <span>File: {{ filename }} (10 rows example)</span>
-        {{ rdfModel | model_as_table | safe }}
+        File: <b>{{ filename }}</b> (10 row example)
+        {{ rdfModel | model_as_table:10 | safe }}
         </div>
     </div>
 </div>
 
 <div class="content" id="rdf_view">
-
-	<h3>RDF VIEW</h3>
-
+	<h3 style="display: inline">RDF VIEW</h3><span>(10 rows example)</span>
 </div>
 
 </form>
@@ -236,7 +234,7 @@ <h3>RDF VIEW</h3>
 function adapt_RDF_preview() {
 
     var rdf_view = $("#rdf_view");
-    var tbl = model_to_table(get_model());
+    var tbl = model_to_table(get_model(), 10);
     rdf_view.find("table").remove();
     rdf_view.append(tbl);
 

templates/transformation/csv_object.html

@@ -34,15 +34,14 @@ <h3>Specify the RDF Object</h3>
     <div class="content scrollit">
         <h3>DATA VIEW</h3>
         <div>
-        File: <b>{{ filename }}</b> (10 rows example)
+        File: <b>{{ filename }}</b> (complete data)
         {{ rdfModel | model_as_table_object | safe }}
         </div>
     </div>
 </div>
 
 <div class="content" id="rdf_view">
-	<h3>RDF VIEW</h3>
-
+	<h3 style="display: inline">RDF VIEW</h3><span>(10 row example)</span>
 </div>
 
 </form>
@@ -378,7 +377,7 @@ <h3>RDF VIEW</h3>
 	});
 
 	var rdf_view = $("#rdf_view");
-	var tbl = model_to_table(get_model());
+	var tbl = model_to_table(get_model(), 10);
 	rdf_view.find("table").remove();
 	rdf_view.append(tbl);
 

templates/transformation/csv_predicate.html

@@ -35,16 +35,13 @@ <h3>Specify the RDF Predicate</h3>
 	<h3>DATA VIEW</h3>
 	<div>
 		File: <b>{{ filename }}</b> (10 rows example)
-		{{ rdfModel | model_as_table_predicate | safe }}
+		{{ rdfModel | model_as_table_predicate:10 | safe }}
 	</div>
 </div></div>
 
 
 <div class="content" id="rdf_view">
-	<h3>RDF VIEW</h3>
-
-
-
+	<h3 style="display: inline">RDF VIEW</h3><span>(10 rows example)</span>
 </div>
 
 </form>
@@ -268,7 +265,7 @@ <h3>RDF VIEW</h3>
 	}
 
 	var rdf_view = $("#rdf_view");
-	var tbl = model_to_table(get_model());
+	var tbl = model_to_table(get_model(), 10);
 	rdf_view.find("table").remove();
 	rdf_view.append(tbl);
 

templates/transformation/csv_publish.html

@@ -31,10 +31,9 @@ <h3>Publish</h3>
 	</div>
 
 
-	<div class="content" id="rdf_view">
-		<h3>RDF VIEW</h3>
-
-	</div>
+<div class="content" id="rdf_view">
+	<h3 style="display: inline">RDF VIEW</h3><span>(complete data)</span>
+</div>
 
 	</form>
 

templates/transformation/csv_subject.html

@@ -84,15 +84,14 @@ <h3>Specify the RDF Subject</h3>
         <h3>DATA VIEW</h3>
         <div>
         File: <b>{{ filename }}</b> (10 rows example)
-        {{ rdfModel | model_as_table | safe }}
+        {{ rdfModel | model_as_table:10 | safe }}
         </div>
     </div>
 </div>
 
-    <div class="content" id="rdf_view">
-        <h3>RDF VIEW</h3>
-
-    </div>
+<div class="content" id="rdf_view">
+    <h3 style="display: inline">RDF VIEW</h3><span>(10 rows example)</span>
+</div>
 
     </form>
 
@@ -172,7 +171,7 @@ <h3>RDF VIEW</h3>
     add_model_subject("base_url",base_url_insert.text());
 
     var rdf_view = $("#rdf_view");
-    var tbl = model_to_table(get_model());
+    var tbl = model_to_table(get_model(), 10);
     rdf_view.find("table").remove();
     rdf_view.append(tbl);
 

templatetags/modelview_tags.py

@@ -8,26 +8,26 @@ def n3(filename):
 	return filename.split(".", 1)[0]+".n3"
 
 @register.filter(name='model_as_table')
-def model_as_table(model):
+def model_as_table(model, numrows=-1):
 	result =  '<table class="table_view">'
 	result += model_header_as_table(model)
-	result += model_content_as_table(model)
+	result += model_content_as_table(model, numrows)
 	result += '</table>'
 	return result
 
 @register.filter(name='model_as_table_predicate')
-def model_as_table_predicate(model):
+def model_as_table_predicate(model, numrows=-1):
 	result =  '<table class="table_view">'
 	result += model_header_as_table_predicate(model)
-	result += model_content_as_table(model)
+	result += model_content_as_table(model, numrows)
 	result += '</table>'
 	return result
 
 @register.filter(name='model_as_table_object')
-def model_as_table_object(model):
+def model_as_table_object(model, numrows=-1):
 	result =  '<table class="table_view">'
 	result += model_header_as_table_object(model)
-	result += model_content_as_table(model)
+	result += model_content_as_table(model, numrows)
 	result += '</table>'
 	return result
 
@@ -53,13 +53,18 @@ def model_header_as_table(model):
 	return result
 
 @register.filter(name='model_as_tbody')
-def model_content_as_table(model):
+def model_content_as_table(model, numrows=-1):
 	num_rows = model['num_cols_selected']
 	content = []
 	for col in model['columns']:
 		if col['col_num_new'] > -1: #show column
 			row = []
-			for elem in col['fields']:
+			if(numrows != -1):
+				fields = col['fields'][:numrows]
+			else:
+				fields = col['fields']
+
+			for elem in fields:
 				row.append(elem['orig_val'])
 			content.append(row)
 

views.py

@@ -93,7 +93,7 @@ def csv_upload(request):
 
         if 'button_upload' in request.POST:
             print("UPLOAD BUTTON PRESSED")
-            csv_rows = csv_rows[:11] if csv_rows else None
+            csv_rows = csv_rows if csv_rows else None
 
             request.session['csv_dialect'] = csv_dialect
             request.session['csv_rows'] = csv_rows
@@ -218,7 +218,7 @@ def csv_predicate(request):
     html_post_data = {
         'action': form_action,
         'rdfModel': request.session['model'], 
-        'csvContent': csv_rows_selected_columns[:11],
+        'csvContent': csv_rows_selected_columns,
         'filename': request.session['file_name'],
         'rdfArray': request.session['rdf_array'],
 	    'rdfPrefix': request.session['rdf_prefix']
@@ -284,7 +284,7 @@ def csv_enrich(request):
     html_post_data = {
         'action': form_action,
         'rdfModel': request.session['model'], 
-        'csvContent': csv_rows_selected_columns[:11],
+        'csvContent': csv_rows_selected_columns,
         'filename': request.session['file_name'],
         'rdfArray': request.session['rdf_array'],
 	    'rdfPrefix': request.session['rdf_prefix']
@@ -341,7 +341,7 @@ def csv_publish(request):
         'publish_massage': publish_massage,
         'action': form_action,
         'rdfModel': request.session['model'], 
-        'csvContent': csv_rows_selected_columns[:11],
+        'csvContent': csv_rows_selected_columns,
         'filename': request.session['file_name'],
         'rdfArray': request.session['rdf_array'],
 	    'rdfPrefix': request.session['rdf_prefix']