Added 3grids asp & .net examples. ricoQuery.aspx removed, as all AJAX queries in...

author Matt Brown <dowdybrown@yahoo.com>

Wed, 18 May 2011 13:52:08 +0000 (13:52 +0000)

committer Matt Brown <dowdybrown@yahoo.com>

Wed, 18 May 2011 13:52:08 +0000 (13:52 +0000)
author Matt Brown <dowdybrown@yahoo.com>
Wed, 18 May 2011 13:52:08 +0000 (13:52 +0000)
committer Matt Brown <dowdybrown@yahoo.com>
Wed, 18 May 2011 13:52:08 +0000 (13:52 +0000)
diff --git a/bin/Rico.dll b/bin/Rico.dll

index f244c5d..8b357c8 100644 (file)

Binary files a/bin/Rico.dll and b/bin/Rico.dll differ
diff --git a/examples/asp/3grids.asp b/examples/asp/3grids.asp

new file mode 100644 (file)

index 0000000..7da90f1
--- /dev/null
+++ b/examples/asp/3grids.asp
@@ -0,0 +1,258 @@
+<%@ LANGUAGE="VBSCRIPT" %>\r
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">\r
+<html>\r
+<head>\r
+<title>Rico LiveGrid-3 Grid Example</title>\r
+\r
+<!-- #INCLUDE FILE = "../../plugins/asp/LoadRicoClient.asp" -->\r
+<%\r
+Dim RicoClient\r
+set RicoClient = new LoadRicoClient\r
+RicoClient.SetRicoClientParentPath "../../ricoClient/"\r
+RicoClient.CheckQueryString   ' just for demo\r
+RicoClient.CreateLinks\r
+set RicoClient = Nothing\r
+%>\r
+\r
+<%\r
+session.contents("customergrid")="select CustomerID,CompanyName,ContactName,Address,City,Region,PostalCode,Country,Phone,Fax from customers order by CustomerID"\r
+session.contents("ordergrid")="select CustomerID,OrderID,ShipName,ShipCity,ShipCountry,OrderDate,ShippedDate from orders order by OrderID"\r
+session.contents("detailgrid")="select OrderID,p.ProductName,QuantityPerUnit,od.UnitPrice,Quantity,od.UnitPrice*Quantity as Total,Discount,od.UnitPrice*Quantity*(1.0-Discount) as NetPrice from order_details od left join products p on od.ProductID=p.ProductID order by od.ProductID"\r
+%>\r
+\r
+<link href="../demo.css" type="text/css" rel="stylesheet" />\r
+<script type="text/javascript">\r
+var customerGrid, orderGrid, detailGrid;\r
+\r
+Rico.onLoad( function() {\r
+\r
+  var opts = {  prefetchBuffer: false,\r
+                columnSpecs   : [{canSort:false,visible:false},,,,,{type:'date'},{type:'date'}],\r
+                canFilterDefault: false,\r
+                dblclick      : Rico.eventHandle(window,'orderDrillDown'),\r
+                menuEvent     : 'contextmenu',\r
+                highlightElem : 'menuRow',\r
+                visibleRows   : 'parent'\r
+             };\r
+  orderGrid=new Rico.LiveGrid ('ordergrid', new Rico.Buffer.AjaxSQL('ricoQuery.asp'), opts);\r
+  orderGrid.menu=new Rico.GridMenu();\r
+\r
+  var opts = {  prefetchBuffer: false,\r
+                columnSpecs   : [{canSort:false,visible:false},,,'specDollar','specQty','specDollar','specPercent','specDollar'],\r
+                canFilterDefault: false,\r
+                menuEvent     : 'contextmenu',\r
+                highlightElem : 'menuRow',\r
+                visibleRows   : 'parent'\r
+             };\r
+  detailGrid=new Rico.LiveGrid ('detailgrid', new Rico.Buffer.AjaxSQL('ricoQuery.asp'), opts);\r
+  detailGrid.menu=new Rico.GridMenu();\r
+\r
+  var opts = {  prefetchBuffer: true,\r
+                frozenColumns : 2,\r
+                dblclick      : Rico.eventHandle(window,'customerDrillDown'),\r
+                menuEvent     : 'contextmenu',\r
+                highlightElem : 'menuRow',\r
+                saveColumnInfo: {width:true, filter:true, sort:true},\r
+                visibleRows   : 'parent'\r
+             };\r
+  customerGrid=new Rico.LiveGrid ('customergrid', new Rico.Buffer.AjaxSQL('ricoQuery.asp'), opts);\r
+  customerGrid.menu=new Rico.GridMenu();\r
+});\r
+\r
+function MeasureLayout() {\r
+  var c=Rico.select('div.gridcontainer');\r
+  var msg='';\r
+  for (var i=0; i < c.length; i++)\r
+    msg+='Container'+i+': offsetHeight='+c[i].offsetHeight+'  scrollHeight='+c[i].scrollHeight+'\n';\r
+  alert(msg);\r
+}\r
+\r
+function customerDrillDown(e) {\r
+  var cell=Rico.eventElement(e);\r
+  cell=Rico.getParentByTagName(cell,'div','ricoLG_cell');\r
+  if (!cell) return;\r
+  Rico.eventStop(e);\r
+  var winIdx=customerGrid.winCellIndex(cell);\r
+  var dataIdx=customerGrid.datasetIndex(cell);\r
+  if (!dataIdx.onBlankRow) {\r
+    customerGrid.highlight(winIdx);\r
+    var custid=customerGrid.columns[0].getValue(winIdx.row);\r
+    Rico.$("order_caption").innerHTML='Orders for '+custid;\r
+    Rico.$("detail_caption").innerHTML="";\r
+    orderGrid.columns[0].setSystemFilter("EQ",custid);\r
+    detailGrid.resetContents();\r
+  }\r
+  return false;\r
+}\r
+\r
+function orderDrillDown(e) {\r
+  var cell=Rico.eventElement(e);\r
+  cell=Rico.getParentByTagName(cell,'div','ricoLG_cell');\r
+  if (!cell) return;\r
+  Rico.eventStop(e);\r
+  var winIdx=orderGrid.winCellIndex(cell);\r
+  var dataIdx=orderGrid.datasetIndex(cell);\r
+  if (!dataIdx.onBlankRow) {\r
+    orderGrid.highlight(winIdx);\r
+    var orderid=orderGrid.columns[1].getValue(winIdx.row);\r
+    Rico.$("detail_caption").innerHTML='Order #'+orderid;\r
+    detailGrid.columns[0].setSystemFilter("EQ",orderid);\r
+  }\r
+  return false;\r
+}\r
+\r
+function detailDataMenu(objCell,onBlankRow) {\r
+  return !onBlankRow;\r
+}\r
+\r
+</script>\r
+\r
+<style type="text/css">\r
+ html, body {\r
+    height:96%;\r
+    margin: 0px;\r
+    padding: 0px;\r
+    border: none;\r
+ }\r
+\r
+\r
+.gridcontainer {\r
+  margin-left:5px;\r
+  width:70%;\r
+  overflow:visible;\r
+  float: left;\r
+  font-size: 8pt !important;\r
+}\r
+\r
+#explanation {\r
+  overflow:auto;\r
+  height:99%;\r
+  width:25%;\r
+  font-size:8pt;\r
+  font-family:Verdana, Arial, Helvetica, sans-serif;\r
+  float: left;\r
+  padding: 5px;\r
+}\r
+\r
+div.ricoLG_cell {\r
+  font-size: 8pt;\r
+  height: 12px;\r
+  white-space: nowrap;\r
+}\r
+</style>\r
+\r
+</head>\r
+\r
+<body>\r
+<div id='explanation'>\r
+Base Library: \r
+<script type='text/javascript'>\r
+document.write(Rico.Lib+' '+Rico.LibVersion);\r
+</script>\r
+<hr>\r
+<p>Unlike the other examples, grid menus are activated in this example\r
+by <strong>right-clicking</strong> on a grid (ctrl-click in Opera, Konqueror, or Safari). \r
+<p>To filter: right-click \r
+on the value that you would like to use as the basis for filtering, \r
+then select the desired filtering method from the pop-up menu.\r
+<p>Right-click anywhere in a column to see sort, hide, and show options.\r
+<p><strong>Double-click</strong> on a row to see all orders for that customer.\r
+Double-click on an order to see the line items for that order.\r
+<p>Drag the edge of a column heading to resize a column.\r
+<!--\r
+<p><button onclick='MeasureLayout();'>Measure Grid Containers</button>\r
+-->\r
+</div>\r
+\r
+<div class='gridcontainer' style='height:39%'>\r
+\r
+<p class="ricoBookmark"><span class='ricoCaption'>Customers</span>\r
+<span id="customergrid_bookmark"></span>\r
+</p>\r
+<table id="customergrid">\r
+<colgroup>\r
+<col style='width:60px;' >\r
+<col style='width:150px;' >\r
+<col style='width:115px;'>\r
+<col style='width:130px;' >\r
+<col style='width:90px;' >\r
+<col style='width:60px;' >\r
+<col style='width:90px;' >\r
+<col style='width:100px;'>\r
+<col style='width:115px;'>\r
+<col style='width:115px;'>\r
+</colgroup>\r
+  <tr>\r
+         <th>Cust ID</th>\r
+         <th>Company</th>\r
+         <th>Contact</th>\r
+         <th>Address</th>\r
+         <th>City</th>\r
+         <th>Region</th>\r
+         <th>Postal Code</th>\r
+         <th>Country</th>\r
+         <th>Phone</th>\r
+         <th>Fax</th>\r
+  </tr>\r
+</table>\r
+\r
+</div>\r
+<div class='gridcontainer' style='height:30%'>\r
+\r
+<p class="ricoBookmark"><span id="order_caption" class='ricoCaption'></span>\r
+<span id="ordergrid_bookmark">&nbsp;</span>\r
+</p>\r
+<table id="ordergrid">\r
+<colgroup>\r
+<col style='width:60px;'  >\r
+<col style='width:60px;' >\r
+<col style='width:150px;'>\r
+<col style='width:80px;' >\r
+<col style='width:90px;' >\r
+<col style='width:100px;'>\r
+<col style='width:100px;'>\r
+</colgroup>\r
+  <tr>\r
+         <th>Customer#</th>\r
+         <th>Order#</th>\r
+         <th>Ship Name</th>\r
+         <th>Ship City</th>\r
+         <th>Ship Country</th>\r
+         <th>Order Date</th>\r
+         <th>Ship Date</th>\r
+  </tr>\r
+</table>\r
+\r
+</div>\r
+<div class='gridcontainer' style='height:30%'>\r
+\r
+<p class="ricoBookmark"><span id="detail_caption" class='ricoCaption'></span>\r
+<span id="detailgrid_bookmark">&nbsp;</span>\r
+</p>\r
+<table id="detailgrid">\r
+<colgroup>\r
+<col style='width:60px;'  >\r
+<col style='width:150px;'>\r
+<col style='width:125px;'>\r
+<col style='width:80px;' >\r
+<col style='width:50px;' >\r
+<col style='width:80px;' >\r
+<col style='width:80px;' >\r
+<col style='width:90px;' >\r
+</colgroup>\r
+  <tr>\r
+         <th>Order #</th>\r
+         <th>Description</th>\r
+         <th>Unit Quantity</th>\r
+         <th>Unit Price</th>\r
+         <th>Qty</th>\r
+         <th>Total</th>\r
+         <th>Discount</th>\r
+         <th>Net Price</th>\r
+  </tr>\r
+</table>\r
+\r
+</div>\r
+\r
+</body>\r
+</html>\r
diff --git a/examples/asp/menu.html b/examples/asp/menu.html

index 8c8d988..829965d 100644 (file)
--- a/examples/asp/menu.html
+++ b/examples/asp/menu.html
@@ -52,6 +52,7 @@ ul li {
  <li><a id="demo_ex1.asp">LiveGrid sourced from HTML table</a>\r
  <li><a id="demo_ex2xml.asp">LiveGrid sourced from SQL database (xml)</a>\r
  <li><a id="demo_ex2json.asp">LiveGrid sourced from SQL database (json)</a>\r
+<li><a id="demo_3grids.asp">3 grids with drill-down</a>\r
  <li><a id="demo_ShipperEdit.asp">Editable LiveGrid (Shippers)</a>\r
  <li><a id="demo_ex2editfilter.asp">Editable LiveGrid (Orders)</a> - select customer on new order via tree\r
  <li><a id="demo_ex2editfilterKW.asp">Editable LiveGrid (Orders)</a> - select customer on new order via search box\r
diff --git a/examples/data/Readme.txt b/examples/data/Readme.txt

index 33f6649..0ab4ee9 100644 (file)
--- a/examples/data/Readme.txt
+++ b/examples/data/Readme.txt
@@ -10,4 +10,8 @@ Data is available in 4 formats:
  \r
  4) ORA-EXPDAT.DMP - an Oracle export file for the Northwind schema -- generated using the "exp" utility in Oracle XE. The password for this schema is "password".\r
  \r
-A version for MS SQL Server 2005 is available as a free download from msdn.microsoft.com. After installing it, you will need to either rename the [Order Details] table  to Order_Details, or create a view named Order_Details that contains "select * from [Order Details]".\r
+A version for MS SQL Server is available as a free download from msdn.microsoft.com. \r
+Try this link: http://archive.msdn.microsoft.com/northwind/Release/ProjectReleases.aspx?ReleaseId=1401\r
+After installing it, you will need to either rename the [Order Details] table to Order_Details, \r
+or create a view named Order_Details that contains "select * from [Order Details]".\r
+\r
diff --git a/examples/dotnet/3grids.aspx b/examples/dotnet/3grids.aspx

new file mode 100644 (file)

index 0000000..73e088f
--- /dev/null
+++ b/examples/dotnet/3grids.aspx
@@ -0,0 +1,188 @@
+<%@ Page Language="VB" ResponseEncoding="iso-8859-1" %>\r
+<%@ Register TagPrefix="Rico" Assembly="Rico" NameSpace="Rico" %>\r
+<%@ Register TagPrefix="My" TagName="dbLib" Src="dbConnect.ascx" %>\r
+<My:dbLib id='app' runat='server' />\r
+\r
+<script runat="server">\r
+\r
+Sub Page_Load(Sender As object, e As EventArgs)\r
+  Session.Timeout=60\r
+  if app.OpenGrid(customer,"contextmenu") then\r
+    app.SetGridOptions(order,"contextmenu")\r
+    app.SetGridOptions(detail,"contextmenu")\r
+    order.sendDebugMsgs=true\r
+    order.LogSqlOnError=true\r
+    detail.sendDebugMsgs=true\r
+    detail.LogSqlOnError=true\r
+  end if\r
+End Sub\r
+\r
+</script>\r
+\r
+\r
+\r
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">\r
+<html>\r
+<head>\r
+<title>Rico LiveGrid-3 Grid Example</title>\r
+\r
+<Rico:LoadClient checkQueryString='true' runat='server' />\r
+<link href="../demo.css" type="text/css" rel="stylesheet" />\r
+\r
+<script type="text/javascript">\r
+\r
+function MeasureLayout() {\r
+  var c=Rico.select('div.gridcontainer');\r
+  var msg='';\r
+  for (var i=0; i < c.length; i++)\r
+    msg+='Container'+i+': offsetHeight='+c[i].offsetHeight+'  scrollHeight='+c[i].scrollHeight+'\n';\r
+  alert(msg);\r
+}\r
+\r
+function customerDrillDown(e) {
+  var cell=Rico.eventElement(e);
+  cell=Rico.getParentByTagName(cell,'div','ricoLG_cell');\r
+  if (!cell) return;\r
+  Rico.eventStop(e);
+  var winIdx=customer['grid'].winCellIndex(cell);\r
+  var dataIdx=customer['grid'].datasetIndex(cell);\r
+  if (!dataIdx.onBlankRow) {\r
+    customer['grid'].highlight(winIdx);\r
+    var custid=customer['grid'].columns[0].getValue(winIdx.row);\r
+    Rico.$("order_caption").innerHTML='Orders for '+custid;\r
+    Rico.$("detail_caption").innerHTML="";\r
+    order['grid'].columns[0].setSystemFilter("EQ",custid);\r
+    detail['grid'].resetContents();\r
+  }\r
+  return false;
+}\r
+\r
+function orderDrillDown(e) {
+  var cell=Rico.eventElement(e);
+  cell=Rico.getParentByTagName(cell,'div','ricoLG_cell');\r
+  if (!cell) return;\r
+  Rico.eventStop(e);
+  var winIdx=order['grid'].winCellIndex(cell);\r
+  var dataIdx=order['grid'].datasetIndex(cell);\r
+  if (!dataIdx.onBlankRow) {\r
+    order['grid'].highlight(winIdx);\r
+    var orderid=order['grid'].columns[1].getValue(winIdx.row);\r
+    Rico.$("detail_caption").innerHTML='Order #'+orderid;\r
+    detail['grid'].columns[0].setSystemFilter("EQ",orderid);\r
+  }\r
+  return false;
+}\r
+\r
+function detailDataMenu(objCell,onBlankRow) {\r
+  return !onBlankRow;\r
+}\r
+\r
+</script>\r
+\r
+<style type="text/css">\r
+ html, body {\r
+    height:96%;\r
+    margin: 0px;\r
+    padding: 0px;\r
+    border: none;\r
+ }\r
+\r
+\r
+.gridcontainer {\r
+  margin-left:5px;\r
+  width:70%;\r
+  overflow:visible;\r
+  float: left;\r
+  font-size: 8pt !important;\r
+}\r
+\r
+#explanation {\r
+  overflow:auto;\r
+  height:99%;\r
+  width:25%;\r
+  font-size:8pt;\r
+  font-family:Verdana, Arial, Helvetica, sans-serif;\r
+  float: left;\r
+  padding: 5px;\r
+}\r
+\r
+div.ricoLG_cell {\r
+  font-size: 8pt;\r
+  height: 12px;\r
+  white-space: nowrap;\r
+}\r
+</style>\r
+\r
+</head>\r
+\r
+\r
+\r
+<body>\r
+\r
+<div id='explanation'>\r
+Base Library: \r
+<script type='text/javascript'>\r
+document.write(Rico.Lib+' '+Rico.LibVersion);\r
+</script>\r
+<hr>\r
+<p>Unlike the other examples, grid menus are activated in this example\r
+by <strong>right-clicking</strong> on a grid (ctrl-click in Opera, Konqueror, or Safari). \r
+<p>To filter: right-click \r
+on the value that you would like to use as the basis for filtering, \r
+then select the desired filtering method from the pop-up menu.\r
+<p>Right-click anywhere in a column to see sort, hide, and show options.\r
+<p><strong>Double-click</strong> on a row to see all orders for that customer.\r
+Double-click on an order to see the line items for that order.\r
+<p>Drag the edge of a column heading to resize a column.\r
+<!--\r
+<p><button onclick='MeasureLayout();'>Measure Grid Containers</button>\r
+-->\r
+</div>\r
+\r
+<div class='gridcontainer' style='height:39%'>\r
+\r
+<Rico:LiveGrid runat='server' id='customer' caption='Customers' rows='-4' frozenColumns='2' TableName='customers' DefaultSort='CustomerID' menuEvent='contextmenu' DisplayTimer='false' highlightElem='menuRow' dblclick="Rico.eventHandle(window,'customerDrillDown')">\r
+  <Rico:Column runat='server' heading='Customer#'   colname='CustomerID'  width='60' />\r
+  <Rico:Column runat='server' heading='Company'     colname='CompanyName' width='150' />\r
+  <Rico:Column runat='server' heading='Contact'     colname='ContactName' width='115' />\r
+  <Rico:Column runat='server' heading='Address'     colname='Address'     width='130' />\r
+  <Rico:Column runat='server' heading='City'        colname='City'        width='90' />\r
+  <Rico:Column runat='server' heading='Region'      colname='Region'      width='60' />\r
+  <Rico:Column runat='server' heading='Postal Code' colname='PostalCode'  width='90' />\r
+  <Rico:Column runat='server' heading='Country'     colname='Country'     width='100' />\r
+  <Rico:Column runat='server' heading='Phone'       colname='Phone'       width='115' />\r
+  <Rico:Column runat='server' heading='Fax'         colname='Fax'         width='115' />\r
+</Rico:LiveGrid>\r
+\r
+</div>\r
+<div class='gridcontainer' style='height:30%'>\r
+\r
+<Rico:LiveGrid runat='server' id='order' caption='' rows='-4' prefetchBuffer='false' TableName='orders' DefaultSort='OrderID' menuEvent='contextmenu' DisplayTimer='false' highlightElem='menuRow' dblclick="Rico.eventHandle(window,'orderDrillDown')">\r
+  <Rico:Column runat='server' heading='Customer#'    colname='CustomerID'  width='60' canSort='false' visible='false'/>\r
+  <Rico:Column runat='server' heading='Order#'       colname='OrderID'     width='60' />\r
+  <Rico:Column runat='server' heading='Ship Name'    colname='ShipName'    width='150' />\r
+  <Rico:Column runat='server' heading='Ship City'    colname='ShipCity'    width='80' />\r
+  <Rico:Column runat='server' heading='Ship Country' colname='ShipCountry' width='90' />\r
+  <Rico:Column runat='server' heading='Order Date'   colname='OrderDate'   width='100' datatype='date' />\r
+  <Rico:Column runat='server' heading='Ship Date'    colname='ShippedDate' width='100' datatype='date' />\r
+</Rico:LiveGrid>\r
+\r
+</div>\r
+<div class='gridcontainer' style='height:30%'>\r
+\r
+<Rico:LiveGrid runat='server' id='detail' caption='' rows='-4' prefetchBuffer='false' TableName='order_details' menuEvent='contextmenu' DisplayTimer='false' highlightElem='menuRow'>\r
+  <Rico:AltTable runat='server' TblName='products' TblAlias='p' JoinCondition='t.ProductId=p.ProductId' />\r
+  <Rico:Column runat='server' heading='Order#'        colname='OrderID' width='60' canSort='false' visible='false' />\r
+  <Rico:Column runat='server' heading='Description'   colname='ProductName' width='150' AltTable='products' />\r
+  <Rico:Column runat='server' heading='Unit Quantity' colname='QuantityPerUnit' width='125' AltTable='products' />\r
+  <Rico:Column runat='server' heading='Unit Price'    colname='UnitPrice' width='80' format='Dollar' AltTable='products' />\r
+  <Rico:Column runat='server' heading='Qty'           colname='Quantity' width='50' format='Qty' />\r
+  <Rico:Column runat='server' heading='Total'         formula='t.UnitPrice*t.Quantity' width='80' format='Dollar' />\r
+  <Rico:Column runat='server' heading='Discount'      colname='Discount' width='80' format='Percent' />\r
+  <Rico:Column runat='server' heading='Net Price'     formula='t.UnitPrice*t.Quantity*(1.0-Discount)' width='90' format='Dollar' />\r
+</Rico:LiveGrid>\r
+\r
+</div>\r
+\r
+</body>\r
+</html>\r
diff --git a/examples/dotnet/CustTree.aspx b/examples/dotnet/CustTree.aspx

index 81a1326..1c1335e 100644 (file)
--- a/examples/dotnet/CustTree.aspx
+++ b/examples/dotnet/CustTree.aspx
@@ -1,38 +1,29 @@
-<%@ Page Language="vb" Debug="true" %>\r
-<%@ Register TagPrefix="Rico" TagName="XmlWriter" Src="../../plugins/dotnet/ricoResponse.ascx" %>\r
+<%@ Page Language="vb" %>\r
+<%@ Register TagPrefix="Rico" Assembly="Rico" NameSpace="Rico" %>\r
  <%@ Register TagPrefix="My" TagName="dbLib" Src="dbConnect.ascx" %>\r
  <My:dbLib id='app' runat='server' />\r
  \r
  <script runat="server">\r
  \r
-dim RequestId as string\r
-dim parent as string\r
-\r
  Sub Page_Load(Sender As object, e As EventArgs)\r
-  Response.CacheControl = "no-cache"\r
-  Response.AddHeader("Pragma", "no-cache")\r
-  Response.Expires = -1\r
-  Response.ContentType="text/xml"\r
-  \r
-  RequestId=trim(Request.QueryString("id"))\r
-  parent=trim(Request.QueryString("Parent"))\r
+  Dim parent as String = Left(Request.QueryString("Parent"),1)  ' first character of company name\r
  \r
-  if RequestId="" then\r
-    XmlObj.ErrorMsg="No ID provided!"\r
-  elseif not app.OpenDB() then\r
-    XmlObj.ErrorMsg=app.LastErrorMsg\r
+  if not app.OpenDB() then\r
+    TreeData.ErrorMsg=app.LastErrorMsg\r
    else\r
-    XmlObj.dbConnection=app.dbConnection\r
-    XmlObj.dbDialect=app.dbDialect\r
+    TreeData.dbConnection=app.dbConnection\r
      if parent <> "" then\r
-      XmlObj.sqlText="SELECT '" & parent & "',CustomerID,CompanyName,'L',1 FROM customers where CompanyName like '" & parent & "%'"\r
+      ' get the leaf nodes - customer names starting with the letter contained in parent\r
+      TreeData.sqlText="SELECT '" & parent & "',CustomerID,CompanyName,'L',1 FROM customers where CompanyName like '" & parent & "%'"\r
      else\r
-      XmlObj.WriteTreeRow("","root","Customer names starting with...","C",0)\r
-      XmlObj.sqlText="SELECT distinct 'root',left(CompanyName,1),left(CompanyName,1),'C',0 FROM customers"\r
+      ' this is a request for the root node\r
+      TreeData.WriteTreeRow("","root","Customer names starting with...","C",0)\r
+      ' return a list of the first letters of the company names\r
+      TreeData.sqlText="SELECT distinct 'root',left(CompanyName,1),left(CompanyName,1),'C',0 FROM customers"\r
      end if\r
    end if\r
  End Sub\r
  \r
  </script>\r
  \r
-<Rico:XmlWriter id="XmlObj" runat="server"/>\r
+<Rico:TreeResponse id="TreeData" runat="server"/>\r
diff --git a/examples/dotnet/RicoDbViewerDetail.aspx b/examples/dotnet/RicoDbViewerDetail.aspx

index b291d7d..4fa5028 100644 (file)
--- a/examples/dotnet/RicoDbViewerDetail.aspx
+++ b/examples/dotnet/RicoDbViewerDetail.aspx
@@ -10,10 +10,9 @@ Dim TableName as String
  Sub Page_Load(Sender As object, e As EventArgs)\r
    Dim restrictions() As String = New String(2) {}\r
    Dim ColumnInfo As DataTable\r
-  Dim columnlist as String\r
  \r
    TableName = trim(request.querystring("id"))\r
-  if app.OpenDB() then\r
+  if  app.OpenGrid(dbViewer) then\r
  \r
      restrictions(2)=TableName\r
      ColumnInfo = app.dbConnection.GetSchema ("Columns", restrictions)\r
@@ -24,22 +23,21 @@ Sub Page_Load(Sender As object, e As EventArgs)
        datatype=colinfo("DATA_TYPE").ToString\r
        if IsNothing(colname0) then colname0=colname\r
        if IsNumeric(datatype) then datatype=ADOColType(datatype)\r
-      if not IsNothing(columnlist) then\r
-        columnlist=columnlist & ","\r
-      end if\r
+\r
+      Dim ColumnObj as New Rico.Column()\r
        if InStr(1,datatype,"binary",1) > 0 or left(datatype,3)="???" or datatype="image" then\r
-        columnlist=columnlist & "'?'"\r
+        ColumnObj.Formula = "'?'"\r
        else\r
-        columnlist=columnlist & colname\r
+        ColumnObj.ColName = colname\r
        end if\r
-      Dim ColumnObj as New Rico.Column()\r
        ColumnObj.Heading=colname\r
        ColumnObj.width=100\r
        if InStr(1,datatype,"DATETIME",1) > 0 then ColumnObj.DataType="datetime"\r
        dbViewer.AddColumn(ColumnObj)\r
      Next\r
-    dbViewer.sqlQuery="select " & columnlist & " from [" & TableName & "] order by " & colname0\r
-\r
+    dbViewer.DefaultSort = colname0\r
+    dbViewer.TableName = "[" & TableName & "]"\r
+    \r
    end if\r
  End Sub\r
  \r
@@ -76,10 +74,7 @@ div.ricoLG_cell {
  <body>\r
  \r
  <p><strong><%=TableName%></strong>\r
-<Rico:LiveGrid runat='server' id='dbViewer' highlightElem='cursorRow' menuEvent='click' >\r
-<GridColumns>\r
-</GridColumns>\r
-</Rico:LiveGrid>\r
+<Rico:LiveGrid runat='server' id='dbViewer' highlightElem='cursorRow' menuEvent='click' />\r
  \r
  </body>\r
  </html>\r
diff --git a/examples/dotnet/ShipperEdit.aspx b/examples/dotnet/ShipperEdit.aspx

index f4c01c1..63f2a6b 100644 (file)
--- a/examples/dotnet/ShipperEdit.aspx
+++ b/examples/dotnet/ShipperEdit.aspx
@@ -11,15 +11,6 @@ Sub Page_Load(Sender As object, e As EventArgs)
    app.OpenGridForm(ex8)\r
  End Sub\r
  \r
-Protected Overrides Sub Render(writer as HTMLTextWriter)\r
-  select case ex8.action\r
-    case "table": MyBase.Render(writer)\r
-    case "ins":   ex8.InsertRecord(writer)\r
-    case "upd":   ex8.UpdateRecord(writer)\r
-    case "del":   ex8.DeleteRecord(writer)\r
-  end select\r
-End Sub\r
-\r
  </script>\r
  \r
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">\r
diff --git a/examples/dotnet/dbConnect.ascx b/examples/dotnet/dbConnect.ascx

index ce40d29..8caa58a 100644 (file)
--- a/examples/dotnet/dbConnect.ascx
+++ b/examples/dotnet/dbConnect.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="vb" debug="true"%>\r
+<%@ Control Language="vb" %>\r
  <%@ Import Namespace="System.Data" %>\r
  <%@ Import Namespace="System.Data.OleDb" %>\r
  <%@ Import Namespace="System.Data.SqlClient" %>\r
@@ -42,23 +42,34 @@ Public function OpenApp()
  end function\r
  \r
  \r
-Public function OpenGridForm(oLiveGrid as object)\r
-  OpenGridForm=false\r
+Public function OpenGrid(oLiveGrid as object, optional menuevent as string = "click")\r
+  OpenGrid=false\r
    if not OpenApp() then\r
      response.write("ERROR: " & LastErrorMsg)\r
      response.end\r
      exit function\r
    end if\r
+  SetGridOptions(oLiveGrid,menuevent)\r
+  OpenGrid=true\r
+end function\r
+\r
+\r
+Public sub SetGridOptions(oLiveGrid as object, optional menuevent as string = "click")\r
    oLiveGrid.dbConnection=Me.dbConnection\r
    oLiveGrid.dbDialect=Me.dbDialect\r
  \r
    '-------------------------------\r
    ' set application-wide defaults\r
    '-------------------------------\r
-  'oLiveGrid.dataProvider="ricoXMLquery.aspx"\r
    oLiveGrid.highlightElem="menuRow"\r
-  oLiveGrid.menuEvent="click"\r
+  oLiveGrid.menuEvent=menuevent\r
    'Session.Timeout=60\r
+end sub\r
+\r
+\r
+Public function OpenGridForm(oLiveGrid as object)\r
+  OpenGridForm=false\r
+  if not OpenGrid(oLiveGrid) then exit function\r
  \r
    '-------------------------------\r
    ' set security rights\r
diff --git a/examples/dotnet/employees.aspx b/examples/dotnet/employees.aspx

index 3c21983..91bac32 100644 (file)
--- a/examples/dotnet/employees.aspx
+++ b/examples/dotnet/employees.aspx
@@ -13,15 +13,6 @@ Sub Page_Load(Sender As object, e As EventArgs)
    app.OpenGridForm(emp)\r
  End Sub\r
  \r
-Protected Overrides Sub Render(writer as HTMLTextWriter)\r
-  select case emp.action\r
-    case "table": MyBase.Render(writer)\r
-    case "ins":   emp.InsertRecord(writer)\r
-    case "upd":   emp.UpdateRecord(writer)\r
-    case "del":   emp.DeleteRecord(writer)\r
-  end select\r
-End Sub\r
-\r
  </script>\r
  \r
  \r
diff --git a/examples/dotnet/ex1.aspx b/examples/dotnet/ex1.aspx

index 796cfd0..7556633 100644 (file)
--- a/examples/dotnet/ex1.aspx
+++ b/examples/dotnet/ex1.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="VB" ResponseEncoding="iso-8859-1" Debug="true" validateRequest="false" %>\r
+<%@ Page Language="VB" ResponseEncoding="iso-8859-1" validateRequest="false" %>\r
  <%@ Register TagPrefix="Rico" Assembly="Rico" NameSpace="Rico" %>\r
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">\r
  <html>\r
@@ -47,1860 +47,240 @@ Department of Economic and Social Affairs of the United Nations Secretariat</a>
  <p class="ricoBookmark"><span id="population_bookmark">&nbsp;</span></p>\r
  <table class="ricoLiveGrid" id="population">\r
  <thead>\r
- <tr>\r
-  <td class='ricoFrozen'></td>\r
-  <td colspan=5>Population (thousands)</td>\r
- </tr>\r
- <tr>\r
-  <td class='ricoFrozen'>Country or area</td>\r
-  <td>1950</td>\r
-  <td>2009</td>\r
-  <td>2015</td>\r
-  <td>2025</td>\r
-  <td>2050</td>\r
- </tr>\r
+ <tr>  <td class='ricoFrozen'></td>  <td colspan=5>Population (thousands)</td> </tr>\r
+ <tr>  <td class='ricoFrozen'>Country or area</td>  <td>1950</td>  <td>2009</td>  <td>2015</td>  <td>2025</td>  <td>2050</td> </tr>\r
  </thead>\r
  <tbody>\r
- <tr>\r
-  <td>Afghanistan</td>\r
-  <td>8151</td>\r
-  <td>28150</td>\r
-  <td>34246</td>\r
-  <td>44970</td>\r
-  <td>73938</td>\r
- </tr>\r
- <tr>\r
-  <td>Albania</td>\r
-  <td>1215</td>\r
-  <td>3155</td>\r
-  <td>3256</td>\r
-  <td>3395</td>\r
-  <td>3303</td>\r
- </tr>\r
- <tr>\r
-  <td>Algeria</td>\r
-  <td>8753</td>\r
-  <td>34895</td>\r
-  <td>38088</td>\r
-  <td>42882</td>\r
-  <td>49610</td>\r
- </tr>\r
- <tr>\r
-  <td>American Samoa</td>\r
-  <td>19</td>\r
-  <td>67</td>\r
-  <td>74</td>\r
-  <td>86</td>\r
-  <td>107</td>\r
- </tr>\r
- <tr>\r
-  <td>Andorra</td>\r
-  <td>6</td>\r
-  <td>86</td>\r
-  <td>93</td>\r
-  <td>107</td>\r
-  <td>137</td>\r
- </tr>\r
- <tr>\r
-  <td>Angola</td>\r
-  <td>4148</td>\r
-  <td>18498</td>\r
-  <td>21690</td>\r
-  <td>27441</td>\r
-  <td>42267</td>\r
- </tr>\r
- <tr>\r
-  <td>Anguilla</td>\r
-  <td>5</td>\r
-  <td>15</td>\r
-  <td>17</td>\r
-  <td>18</td>\r
-  <td>20</td>\r
- </tr>\r
- <tr>\r
-  <td>Antigua and Barbuda</td>\r
-  <td>46</td>\r
-  <td>88</td>\r
-  <td>93</td>\r
-  <td>101</td>\r
-  <td>112</td>\r
- </tr>\r
- <tr>\r
-  <td>Argentina</td>\r
-  <td>17150</td>\r
-  <td>40276</td>\r
-  <td>42548</td>\r
-  <td>45883</td>\r
-  <td>50943</td>\r
- </tr>\r
- <tr>\r
-  <td>Armenia</td>\r
-  <td>1354</td>\r
-  <td>3083</td>\r
-  <td>3139</td>\r
-  <td>3181</td>\r
-  <td>3018</td>\r
- </tr>\r
- <tr>\r
-  <td>Aruba</td>\r
-  <td>38</td>\r
-  <td>107</td>\r
-  <td>109</td>\r
-  <td>112</td>\r
-  <td>106</td>\r
- </tr>\r
- <tr>\r
-  <td>Australia</td>\r
-  <td>8219</td>\r
-  <td>21293</td>\r
-  <td>22607</td>\r
-  <td>24703</td>\r
-  <td>28724</td>\r
- </tr>\r
- <tr>\r
-  <td>Austria</td>\r
-  <td>6936</td>\r
-  <td>8364</td>\r
-  <td>8467</td>\r
-  <td>8600</td>\r
-  <td>8515</td>\r
- </tr>\r
- <tr>\r
-  <td>Azerbaijan</td>\r
-  <td>2896</td>\r
-  <td>8832</td>\r
-  <td>9426</td>\r
-  <td>10128</td>\r
-  <td>10579</td>\r
- </tr>\r
- <tr>\r
-  <td>Bahamas</td>\r
-  <td>79</td>\r
-  <td>342</td>\r
-  <td>366</td>\r
-  <td>402</td>\r
-  <td>455</td>\r
- </tr>\r
- <tr>\r
-  <td>Bahrain</td>\r
-  <td>116</td>\r
-  <td>791</td>\r
-  <td>882</td>\r
-  <td>1021</td>\r
-  <td>1277</td>\r
- </tr>\r
- <tr>\r
-  <td>Bangladesh</td>\r
-  <td>43595</td>\r
-  <td>162221</td>\r
-  <td>175217</td>\r
-  <td>195012</td>\r
-  <td>222495</td>\r
- </tr>\r
- <tr>\r
-  <td>Barbados</td>\r
-  <td>211</td>\r
-  <td>256</td>\r
-  <td>260</td>\r
-  <td>262</td>\r
-  <td>237</td>\r
- </tr>\r
- <tr>\r
-  <td>Belarus</td>\r
-  <td>7745</td>\r
-  <td>9634</td>\r
-  <td>9355</td>\r
-  <td>8851</td>\r
-  <td>7275</td>\r
- </tr>\r
- <tr>\r
-  <td>Belgium</td>\r
-  <td>8628</td>\r
-  <td>10647</td>\r
-  <td>10878</td>\r
-  <td>11191</td>\r
-  <td>11493</td>\r
- </tr>\r
- <tr>\r
-  <td>Belize</td>\r
-  <td>69</td>\r
-  <td>307</td>\r
-  <td>344</td>\r
-  <td>404</td>\r
-  <td>506</td>\r
- </tr>\r
- <tr>\r
-  <td>Benin</td>\r
-  <td>2050</td>\r
-  <td>8935</td>\r
-  <td>10647</td>\r
-  <td>13767</td>\r
-  <td>21982</td>\r
- </tr>\r
- <tr>\r
-  <td>Bermuda</td>\r
-  <td>37</td>\r
-  <td>65</td>\r
-  <td>65</td>\r
-  <td>66</td>\r
-  <td>63</td>\r
- </tr>\r
- <tr>\r
-  <td>Bhutan</td>\r
-  <td>168</td>\r
-  <td>697</td>\r
-  <td>770</td>\r
-  <td>865</td>\r
-  <td>1013</td>\r
- </tr>\r
- <tr>\r
-  <td>Bolivia</td>\r
-  <td>2714</td>\r
-  <td>9863</td>\r
-  <td>10854</td>\r
-  <td>12368</td>\r
-  <td>14908</td>\r
- </tr>\r
- <tr>\r
-  <td>Bosnia and Herzegovina</td>\r
-  <td>2661</td>\r
-  <td>3767</td>\r
-  <td>3727</td>\r
-  <td>3608</td>\r
-  <td>3008</td>\r
- </tr>\r
- <tr>\r
-  <td>Botswana</td>\r
-  <td>413</td>\r
-  <td>1950</td>\r
-  <td>2106</td>\r
-  <td>2337</td>\r
-  <td>2758</td>\r
- </tr>\r
- <tr>\r
-  <td>Brazil</td>\r
-  <td>53975</td>\r
-  <td>193734</td>\r
-  <td>202866</td>\r
-  <td>213802</td>\r
-  <td>218512</td>\r
- </tr>\r
- <tr>\r
-  <td>British Virgin Islands</td>\r
-  <td>7</td>\r
-  <td>23</td>\r
-  <td>24</td>\r
-  <td>26</td>\r
-  <td>28</td>\r
- </tr>\r
- <tr>\r
-  <td>Brunei Darussalam</td>\r
-  <td>48</td>\r
-  <td>400</td>\r
-  <td>443</td>\r
-  <td>513</td>\r
-  <td>658</td>\r
- </tr>\r
- <tr>\r
-  <td>Bulgaria</td>\r
-  <td>7251</td>\r
-  <td>7545</td>\r
-  <td>7263</td>\r
-  <td>6752</td>\r
-  <td>5392</td>\r
- </tr>\r
- <tr>\r
-  <td>Burkina Faso</td>\r
-  <td>4080</td>\r
-  <td>15757</td>\r
-  <td>19013</td>\r
-  <td>24837</td>\r
-  <td>40830</td>\r
- </tr>\r
- <tr>\r
-  <td>Burundi</td>\r
-  <td>2456</td>\r
-  <td>8303</td>\r
-  <td>9413</td>\r
-  <td>11161</td>\r
-  <td>14846</td>\r
- </tr>\r
- <tr>\r
-  <td>Cambodia</td>\r
-  <td>4346</td>\r
-  <td>14805</td>\r
-  <td>16357</td>\r
-  <td>18973</td>\r
-  <td>23795</td>\r
- </tr>\r
- <tr>\r
-  <td>Cameroon</td>\r
-  <td>4466</td>\r
-  <td>19522</td>\r
-  <td>22169</td>\r
-  <td>26478</td>\r
-  <td>36736</td>\r
- </tr>\r
- <tr>\r
-  <td>Canada</td>\r
-  <td>13737</td>\r
-  <td>33573</td>\r
-  <td>35493</td>\r
-  <td>38659</td>\r
-  <td>44414</td>\r
- </tr>\r
- <tr>\r
-  <td>Cape Verde</td>\r
-  <td>146</td>\r
-  <td>506</td>\r
-  <td>548</td>\r
-  <td>616</td>\r
-  <td>703</td>\r
- </tr>\r
- <tr>\r
-  <td>Cayman Islands</td>\r
-  <td>7</td>\r
-  <td>56</td>\r
-  <td>59</td>\r
-  <td>63</td>\r
-  <td>66</td>\r
- </tr>\r
- <tr>\r
-  <td>Central African Republic</td>\r
-  <td>1327</td>\r
-  <td>4422</td>\r
-  <td>4927</td>\r
-  <td>5747</td>\r
-  <td>7603</td>\r
- </tr>\r
- <tr>\r
-  <td>Chad</td>\r
-  <td>2429</td>\r
-  <td>11206</td>\r
-  <td>13120</td>\r
-  <td>16906</td>\r
-  <td>27776</td>\r
- </tr>\r
- <tr>\r
-  <td>Channel Islands</td>\r
-  <td>102</td>\r
-  <td>150</td>\r
-  <td>151</td>\r
-  <td>152</td>\r
-  <td>144</td>\r
- </tr>\r
- <tr>\r
-  <td>Chile</td>\r
-  <td>6082</td>\r
-  <td>16970</td>\r
-  <td>17926</td>\r
-  <td>19266</td>\r
-  <td>20657</td>\r
- </tr>\r
- <tr>\r
-  <td>China</td>\r
-  <td>544951</td>\r
-  <td>1345751</td>\r
-  <td>1395998</td>\r
-  <td>1453140</td>\r
-  <td>1417045</td>\r
- </tr>\r
- <tr>\r
-  <td>China, Hong Kong SAR</td>\r
-  <td>1974</td>\r
-  <td>7022</td>\r
-  <td>7398</td>\r
-  <td>7969</td>\r
-  <td>8623</td>\r
- </tr>\r
- <tr>\r
-  <td>China, Macao SAR</td>\r
-  <td>190</td>\r
-  <td>538</td>\r
-  <td>568</td>\r
-  <td>603</td>\r
-  <td>593</td>\r
- </tr>\r
- <tr>\r
-  <td>Colombia</td>\r
-  <td>12000</td>\r
-  <td>45660</td>\r
-  <td>49385</td>\r
-  <td>54920</td>\r
-  <td>62877</td>\r
- </tr>\r
- <tr>\r
-  <td>Comoros</td>\r
-  <td>156</td>\r
-  <td>676</td>\r
-  <td>767</td>\r
-  <td>907</td>\r
-  <td>1226</td>\r
- </tr>\r
- <tr>\r
-  <td>Congo</td>\r
-  <td>808</td>\r
-  <td>3683</td>\r
-  <td>4225</td>\r
-  <td>5094</td>\r
-  <td>6863</td>\r
- </tr>\r
- <tr>\r
-  <td>Cook Islands</td>\r
-  <td>15</td>\r
-  <td>20</td>\r
-  <td>20</td>\r
-  <td>21</td>\r
-  <td>24</td>\r
- </tr>\r
- <tr>\r
-  <td>Costa Rica</td>\r
-  <td>966</td>\r
-  <td>4579</td>\r
-  <td>4957</td>\r
-  <td>5521</td>\r
-  <td>6373</td>\r
- </tr>\r
- <tr>\r
-  <td>Côte d'Ivoire</td>\r
-  <td>2505</td>\r
-  <td>21075</td>\r
-  <td>24210</td>\r
-  <td>29738</td>\r
-  <td>43373</td>\r
- </tr>\r
- <tr>\r
-  <td>Croatia</td>\r
-  <td>3850</td>\r
-  <td>4416</td>\r
-  <td>4370</td>\r
-  <td>4254</td>\r
-  <td>3825</td>\r
- </tr>\r
- <tr>\r
-  <td>Cuba</td>\r
-  <td>5920</td>\r
-  <td>11204</td>\r
-  <td>11213</td>\r
-  <td>11148</td>\r
-  <td>9725</td>\r
- </tr>\r
- <tr>\r
-  <td>Cyprus</td>\r
-  <td>494</td>\r
-  <td>871</td>\r
-  <td>925</td>\r
-  <td>1014</td>\r
-  <td>1175</td>\r
- </tr>\r
- <tr>\r
-  <td>Czech Republic</td>\r
-  <td>8925</td>\r
-  <td>10369</td>\r
-  <td>10510</td>\r
-  <td>10573</td>\r
-  <td>10294</td>\r
- </tr>\r
- <tr>\r
-  <td>Dem. People's Rep. of Korea</td>\r
-  <td>9737</td>\r
-  <td>23906</td>\r
-  <td>24399</td>\r
-  <td>25128</td>\r
-  <td>24562</td>\r
- </tr>\r
- <tr>\r
-  <td>Dem. Republic of the Congo</td>\r
-  <td>12184</td>\r
-  <td>66020</td>\r
-  <td>77419</td>\r
-  <td>98123</td>\r
-  <td>147512</td>\r
- </tr>\r
- <tr>\r
-  <td>Denmark</td>\r
-  <td>4271</td>\r
-  <td>5470</td>\r
-  <td>5523</td>\r
-  <td>5590</td>\r
-  <td>5551</td>\r
- </tr>\r
- <tr>\r
-  <td>Djibouti</td>\r
-  <td>62</td>\r
-  <td>864</td>\r
-  <td>953</td>\r
-  <td>1111</td>\r
-  <td>1469</td>\r
- </tr>\r
- <tr>\r
-  <td>Dominica</td>\r
-  <td>51</td>\r
-  <td>67</td>\r
-  <td>67</td>\r
-  <td>68</td>\r
-  <td>66</td>\r
- </tr>\r
- <tr>\r
-  <td>Dominican Republic</td>\r
-  <td>2427</td>\r
-  <td>10090</td>\r
-  <td>10867</td>\r
-  <td>11973</td>\r
-  <td>13441</td>\r
- </tr>\r
- <tr>\r
-  <td>Ecuador</td>\r
-  <td>3387</td>\r
-  <td>13625</td>\r
-  <td>14596</td>\r
-  <td>16074</td>\r
-  <td>17989</td>\r
- </tr>\r
- <tr>\r
-  <td>Egypt</td>\r
-  <td>21514</td>\r
-  <td>82999</td>\r
-  <td>91778</td>\r
-  <td>104970</td>\r
-  <td>129533</td>\r
- </tr>\r
- <tr>\r
-  <td>El Salvador</td>\r
-  <td>2200</td>\r
-  <td>6163</td>\r
-  <td>6383</td>\r
-  <td>6895</td>\r
-  <td>7882</td>\r
- </tr>\r
- <tr>\r
-  <td>Equatorial Guinea</td>\r
-  <td>226</td>\r
-  <td>676</td>\r
-  <td>781</td>\r
-  <td>971</td>\r
-  <td>1445</td>\r
- </tr>\r
- <tr>\r
-  <td>Eritrea</td>\r
-  <td>1141</td>\r
-  <td>5073</td>\r
-  <td>6009</td>\r
-  <td>7404</td>\r
-  <td>10787</td>\r
- </tr>\r
- <tr>\r
-  <td>Estonia</td>\r
-  <td>1101</td>\r
-  <td>1340</td>\r
-  <td>1337</td>\r
-  <td>1321</td>\r
-  <td>1233</td>\r
- </tr>\r
- <tr>\r
-  <td>Ethiopia</td>\r
-  <td>18434</td>\r
-  <td>82825</td>\r
-  <td>96237</td>\r
-  <td>119822</td>\r
-  <td>173811</td>\r
- </tr>\r
- <tr>\r
-  <td>Faeroe Islands</td>\r
-  <td>32</td>\r
-  <td>50</td>\r
-  <td>52</td>\r
-  <td>55</td>\r
-  <td>58</td>\r
- </tr>\r
- <tr>\r
-  <td>Falkland Islands (Malvinas)</td>\r
-  <td>2</td>\r
-  <td>3</td>\r
-  <td>3</td>\r
-  <td>3</td>\r
-  <td>3</td>\r
- </tr>\r
- <tr>\r
-  <td>Fiji</td>\r
-  <td>289</td>\r
-  <td>849</td>\r
-  <td>874</td>\r
-  <td>905</td>\r
-  <td>910</td>\r
- </tr>\r
- <tr>\r
-  <td>Finland</td>\r
-  <td>4009</td>\r
-  <td>5326</td>\r
-  <td>5432</td>\r
-  <td>5533</td>\r
-  <td>5445</td>\r
- </tr>\r
- <tr>\r
-  <td>France</td>\r
-  <td>41832</td>\r
-  <td>62343</td>\r
-  <td>63900</td>\r
-  <td>65769</td>\r
-  <td>67668</td>\r
- </tr>\r
- <tr>\r
-  <td>French Guiana</td>\r
-  <td>25</td>\r
-  <td>226</td>\r
-  <td>261</td>\r
-  <td>323</td>\r
-  <td>462</td>\r
- </tr>\r
- <tr>\r
-  <td>French Polynesia</td>\r
-  <td>61</td>\r
-  <td>269</td>\r
-  <td>289</td>\r
-  <td>318</td>\r
-  <td>354</td>\r
- </tr>\r
- <tr>\r
-  <td>Gabon</td>\r
-  <td>469</td>\r
-  <td>1475</td>\r
-  <td>1639</td>\r
-  <td>1915</td>\r
-  <td>2471</td>\r
- </tr>\r
- <tr>\r
-  <td>Gambia</td>\r
-  <td>258</td>\r
-  <td>1705</td>\r
-  <td>1985</td>\r
-  <td>2478</td>\r
-  <td>3763</td>\r
- </tr>\r
- <tr>\r
-  <td>Georgia</td>\r
-  <td>3527</td>\r
-  <td>4260</td>\r
-  <td>4084</td>\r
-  <td>3888</td>\r
-  <td>3267</td>\r
- </tr>\r
- <tr>\r
-  <td>Germany</td>\r
-  <td>68376</td>\r
-  <td>82167</td>\r
-  <td>81346</td>\r
-  <td>79258</td>\r
-  <td>70504</td>\r
- </tr>\r
- <tr>\r
-  <td>Ghana</td>\r
-  <td>4981</td>\r
-  <td>23837</td>\r
-  <td>26925</td>\r
-  <td>32233</td>\r
-  <td>45213</td>\r
- </tr>\r
- <tr>\r
-  <td>Gibraltar</td>\r
-  <td>20</td>\r
-  <td>31</td>\r
-  <td>31</td>\r
-  <td>32</td>\r
-  <td>30</td>\r
- </tr>\r
- <tr>\r
-  <td>Greece</td>\r
-  <td>7566</td>\r
-  <td>11161</td>\r
-  <td>11261</td>\r
-  <td>11274</td>\r
-  <td>10939</td>\r
- </tr>\r
- <tr>\r
-  <td>Greenland</td>\r
-  <td>23</td>\r
-  <td>57</td>\r
-  <td>57</td>\r
-  <td>56</td>\r
-  <td>50</td>\r
- </tr>\r
- <tr>\r
-  <td>Grenada</td>\r
-  <td>77</td>\r
-  <td>104</td>\r
-  <td>107</td>\r
-  <td>109</td>\r
-  <td>97</td>\r
- </tr>\r
- <tr>\r
-  <td>Guadeloupe</td>\r
-  <td>210</td>\r
-  <td>465</td>\r
-  <td>476</td>\r
-  <td>489</td>\r
-  <td>477</td>\r
- </tr>\r
- <tr>\r
-  <td>Guam</td>\r
-  <td>60</td>\r
-  <td>178</td>\r
-  <td>191</td>\r
-  <td>211</td>\r
-  <td>242</td>\r
- </tr>\r
- <tr>\r
-  <td>Guatemala</td>\r
-  <td>3146</td>\r
-  <td>14027</td>\r
-  <td>16227</td>\r
-  <td>19927</td>\r
-  <td>27480</td>\r
- </tr>\r
- <tr>\r
-  <td>Guinea</td>\r
-  <td>2619</td>\r
-  <td>10069</td>\r
-  <td>11844</td>\r
-  <td>15158</td>\r
-  <td>23975</td>\r
- </tr>\r
- <tr>\r
-  <td>Guinea-Bissau</td>\r
-  <td>518</td>\r
-  <td>1611</td>\r
-  <td>1848</td>\r
-  <td>2296</td>\r
-  <td>3555</td>\r
- </tr>\r
- <tr>\r
-  <td>Guyana</td>\r
-  <td>423</td>\r
-  <td>762</td>\r
-  <td>754</td>\r
-  <td>732</td>\r
-  <td>558</td>\r
- </tr>\r
- <tr>\r
-  <td>Haiti</td>\r
-  <td>3221</td>\r
-  <td>10033</td>\r
-  <td>10957</td>\r
-  <td>12476</td>\r
-  <td>15485</td>\r
- </tr>\r
- <tr>\r
-  <td>Holy See</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
- </tr>\r
- <tr>\r
-  <td>Honduras</td>\r
-  <td>1487</td>\r
-  <td>7466</td>\r
-  <td>8386</td>\r
-  <td>9844</td>\r
-  <td>12402</td>\r
- </tr>\r
- <tr>\r
-  <td>Hungary</td>\r
-  <td>9338</td>\r
-  <td>9993</td>\r
-  <td>9874</td>\r
-  <td>9647</td>\r
-  <td>8934</td>\r
- </tr>\r
- <tr>\r
-  <td>Iceland</td>\r
-  <td>143</td>\r
-  <td>323</td>\r
-  <td>353</td>\r
-  <td>384</td>\r
-  <td>407</td>\r
- </tr>\r
- <tr>\r
-  <td>India</td>\r
-  <td>371857</td>\r
-  <td>1198003</td>\r
-  <td>1294192</td>\r
-  <td>1431272</td>\r
-  <td>1613800</td>\r
- </tr>\r
- <tr>\r
-  <td>Indonesia</td>\r
-  <td>77152</td>\r
-  <td>229965</td>\r
-  <td>244191</td>\r
-  <td>263287</td>\r
-  <td>288110</td>\r
- </tr>\r
- <tr>\r
-  <td>Iran (Islamic Republic of)</td>\r
-  <td>16913</td>\r
-  <td>74196</td>\r
-  <td>79454</td>\r
-  <td>87134</td>\r
-  <td>96975</td>\r
- </tr>\r
- <tr>\r
-  <td>Iraq</td>\r
-  <td>5719</td>\r
-  <td>30747</td>\r
-  <td>35884</td>\r
-  <td>44692</td>\r
-  <td>63995</td>\r
- </tr>\r
- <tr>\r
-  <td>Ireland</td>\r
-  <td>2969</td>\r
-  <td>4515</td>\r
-  <td>4886</td>\r
-  <td>5370</td>\r
-  <td>6295</td>\r
- </tr>\r
- <tr>\r
-  <td>Isle of Man</td>\r
-  <td>55</td>\r
-  <td>80</td>\r
-  <td>81</td>\r
-  <td>80</td>\r
-  <td>75</td>\r
- </tr>\r
- <tr>\r
-  <td>Israel</td>\r
-  <td>1258</td>\r
-  <td>7170</td>\r
-  <td>7823</td>\r
-  <td>8769</td>\r
-  <td>10649</td>\r
- </tr>\r
- <tr>\r
-  <td>Italy</td>\r
-  <td>46367</td>\r
-  <td>59870</td>\r
-  <td>60604</td>\r
-  <td>60018</td>\r
-  <td>57066</td>\r
- </tr>\r
- <tr>\r
-  <td>Jamaica</td>\r
-  <td>1403</td>\r
-  <td>2719</td>\r
-  <td>2786</td>\r
-  <td>2866</td>\r
-  <td>2683</td>\r
- </tr>\r
- <tr>\r
-  <td>Japan</td>\r
-  <td>82824</td>\r
-  <td>127156</td>\r
-  <td>125791</td>\r
-  <td>120793</td>\r
-  <td>101659</td>\r
- </tr>\r
- <tr>\r
-  <td>Jordan</td>\r
-  <td>472</td>\r
-  <td>6316</td>\r
-  <td>6957</td>\r
-  <td>8088</td>\r
-  <td>10241</td>\r
- </tr>\r
- <tr>\r
-  <td>Kazakhstan</td>\r
-  <td>6703</td>\r
-  <td>15637</td>\r
-  <td>16289</td>\r
-  <td>17025</td>\r
-  <td>17848</td>\r
- </tr>\r
- <tr>\r
-  <td>Kenya</td>\r
-  <td>6077</td>\r
-  <td>39802</td>\r
-  <td>46433</td>\r
-  <td>57573</td>\r
-  <td>85410</td>\r
- </tr>\r
- <tr>\r
-  <td>Kiribati</td>\r
-  <td>26</td>\r
-  <td>98</td>\r
-  <td>107</td>\r
-  <td>123</td>\r
-  <td>151</td>\r
- </tr>\r
- <tr>\r
-  <td>Kuwait</td>\r
-  <td>152</td>\r
-  <td>2985</td>\r
-  <td>3378</td>\r
-  <td>3988</td>\r
-  <td>5240</td>\r
- </tr>\r
- <tr>\r
-  <td>Kyrgyzstan</td>\r
-  <td>1740</td>\r
-  <td>5482</td>\r
-  <td>5877</td>\r
-  <td>6378</td>\r
-  <td>6882</td>\r
- </tr>\r
- <tr>\r
-  <td>Lao People's Dem. Republic</td>\r
-  <td>1666</td>\r
-  <td>6320</td>\r
-  <td>7028</td>\r
-  <td>8273</td>\r
-  <td>10744</td>\r
- </tr>\r
- <tr>\r
-  <td>Latvia</td>\r
-  <td>1949</td>\r
-  <td>2249</td>\r
-  <td>2197</td>\r
-  <td>2101</td>\r
-  <td>1854</td>\r
- </tr>\r
- <tr>\r
-  <td>Lebanon</td>\r
-  <td>1443</td>\r
-  <td>4224</td>\r
-  <td>4426</td>\r
-  <td>4736</td>\r
-  <td>5033</td>\r
- </tr>\r
- <tr>\r
-  <td>Lesotho</td>\r
-  <td>734</td>\r
-  <td>2067</td>\r
-  <td>2168</td>\r
-  <td>2306</td>\r
-  <td>2491</td>\r
- </tr>\r
- <tr>\r
-  <td>Liberia</td>\r
-  <td>824</td>\r
-  <td>3955</td>\r
-  <td>4665</td>\r
-  <td>5858</td>\r
-  <td>8841</td>\r
- </tr>\r
- <tr>\r
-  <td>Libyan Arab Jamahiriya</td>\r
-  <td>1029</td>\r
-  <td>6420</td>\r
-  <td>7158</td>\r
-  <td>8144</td>\r
-  <td>9819</td>\r
- </tr>\r
- <tr>\r
-  <td>Liechtenstein</td>\r
-  <td>14</td>\r
-  <td>36</td>\r
-  <td>38</td>\r
-  <td>40</td>\r
-  <td>45</td>\r
- </tr>\r
- <tr>\r
-  <td>Lithuania</td>\r
-  <td>2567</td>\r
-  <td>3287</td>\r
-  <td>3143</td>\r
-  <td>2985</td>\r
-  <td>2579</td>\r
- </tr>\r
- <tr>\r
-  <td>Luxembourg</td>\r
-  <td>296</td>\r
-  <td>486</td>\r
-  <td>520</td>\r
-  <td>582</td>\r
-  <td>733</td>\r
- </tr>\r
- <tr>\r
-  <td>Madagascar</td>\r
-  <td>4084</td>\r
-  <td>19625</td>\r
-  <td>22853</td>\r
-  <td>28595</td>\r
-  <td>42693</td>\r
- </tr>\r
- <tr>\r
-  <td>Malawi</td>\r
-  <td>2881</td>\r
-  <td>15263</td>\r
-  <td>17998</td>\r
-  <td>23194</td>\r
-  <td>36575</td>\r
- </tr>\r
- <tr>\r
-  <td>Malaysia</td>\r
-  <td>6110</td>\r
-  <td>27468</td>\r
-  <td>30041</td>\r
-  <td>33770</td>\r
-  <td>39664</td>\r
- </tr>\r
- <tr>\r
-  <td>Maldives</td>\r
-  <td>82</td>\r
-  <td>309</td>\r
-  <td>338</td>\r
-  <td>384</td>\r
-  <td>455</td>\r
- </tr>\r
- <tr>\r
-  <td>Mali</td>\r
-  <td>4268</td>\r
-  <td>13010</td>\r
-  <td>14993</td>\r
-  <td>18603</td>\r
-  <td>28260</td>\r
- </tr>\r
- <tr>\r
-  <td>Malta</td>\r
-  <td>312</td>\r
-  <td>409</td>\r
-  <td>417</td>\r
-  <td>426</td>\r
-  <td>413</td>\r
- </tr>\r
- <tr>\r
-  <td>Marshall Islands</td>\r
-  <td>13</td>\r
-  <td>62</td>\r
-  <td>70</td>\r
-  <td>79</td>\r
-  <td>92</td>\r
- </tr>\r
- <tr>\r
-  <td>Martinique</td>\r
-  <td>222</td>\r
-  <td>405</td>\r
-  <td>411</td>\r
-  <td>418</td>\r
-  <td>393</td>\r
- </tr>\r
- <tr>\r
-  <td>Mauritania</td>\r
-  <td>651</td>\r
-  <td>3291</td>\r
-  <td>3732</td>\r
-  <td>4443</td>\r
-  <td>6061</td>\r
- </tr>\r
- <tr>\r
-  <td>Mauritius</td>\r
-  <td>493</td>\r
-  <td>1288</td>\r
-  <td>1337</td>\r
-  <td>1400</td>\r
-  <td>1426</td>\r
- </tr>\r
- <tr>\r
-  <td>Mayotte</td>\r
-  <td>15</td>\r
-  <td>194</td>\r
-  <td>224</td>\r
-  <td>277</td>\r
-  <td>386</td>\r
- </tr>\r
- <tr>\r
-  <td>Mexico</td>\r
-  <td>27741</td>\r
-  <td>109610</td>\r
-  <td>115528</td>\r
-  <td>123366</td>\r
-  <td>128964</td>\r
- </tr>\r
- <tr>\r
-  <td>Micronesia (Fed. States of)</td>\r
-  <td>32</td>\r
-  <td>111</td>\r
-  <td>114</td>\r
-  <td>122</td>\r
-  <td>128</td>\r
- </tr>\r
- <tr>\r
-  <td>Moldova (Republic of)</td>\r
-  <td>2341</td>\r
-  <td>3604</td>\r
-  <td>3462</td>\r
-  <td>3291</td>\r
-  <td>2734</td>\r
- </tr>\r
- <tr>\r
-  <td>Monaco</td>\r
-  <td>20</td>\r
-  <td>33</td>\r
-  <td>33</td>\r
-  <td>35</td>\r
-  <td>38</td>\r
- </tr>\r
- <tr>\r
-  <td>Mongolia</td>\r
-  <td>761</td>\r
-  <td>2671</td>\r
-  <td>2855</td>\r
-  <td>3134</td>\r
-  <td>3446</td>\r
- </tr>\r
- <tr>\r
-  <td>Montenegro</td>\r
-  <td>399</td>\r
-  <td>624</td>\r
-  <td>627</td>\r
-  <td>633</td>\r
-  <td>618</td>\r
- </tr>\r
- <tr>\r
-  <td>Montserrat</td>\r
-  <td>14</td>\r
-  <td>6</td>\r
-  <td>6</td>\r
-  <td>7</td>\r
-  <td>7</td>\r
- </tr>\r
- <tr>\r
-  <td>Morocco</td>\r
-  <td>8953</td>\r
-  <td>31993</td>\r
-  <td>34330</td>\r
-  <td>37865</td>\r
-  <td>42583</td>\r
- </tr>\r
- <tr>\r
-  <td>Mozambique</td>\r
-  <td>6442</td>\r
-  <td>22894</td>\r
-  <td>25957</td>\r
-  <td>31190</td>\r
-  <td>44148</td>\r
- </tr>\r
- <tr>\r
-  <td>Myanmar</td>\r
-  <td>17158</td>\r
-  <td>50020</td>\r
-  <td>53087</td>\r
-  <td>57585</td>\r
-  <td>63373</td>\r
- </tr>\r
- <tr>\r
-  <td>Namibia</td>\r
-  <td>485</td>\r
-  <td>2171</td>\r
-  <td>2412</td>\r
-  <td>2810</td>\r
-  <td>3588</td>\r
- </tr>\r
- <tr>\r
-  <td>Nauru</td>\r
-  <td>3</td>\r
-  <td>10</td>\r
-  <td>11</td>\r
-  <td>11</td>\r
-  <td>11</td>\r
- </tr>\r
- <tr>\r
-  <td>Nepal</td>\r
-  <td>8126</td>\r
-  <td>29331</td>\r
-  <td>32503</td>\r
-  <td>38031</td>\r
-  <td>49028</td>\r
- </tr>\r
- <tr>\r
-  <td>Netherlands</td>\r
-  <td>10114</td>\r
-  <td>16592</td>\r
-  <td>16915</td>\r
-  <td>17348</td>\r
-  <td>17399</td>\r
- </tr>\r
- <tr>\r
-  <td>Netherlands Antilles</td>\r
-  <td>112</td>\r
-  <td>198</td>\r
-  <td>207</td>\r
-  <td>210</td>\r
-  <td>192</td>\r
- </tr>\r
- <tr>\r
-  <td>New Caledonia</td>\r
-  <td>65</td>\r
-  <td>250</td>\r
-  <td>271</td>\r
-  <td>304</td>\r
-  <td>362</td>\r
- </tr>\r
- <tr>\r
-  <td>New Zealand</td>\r
-  <td>1908</td>\r
-  <td>4266</td>\r
-  <td>4492</td>\r
-  <td>4831</td>\r
-  <td>5349</td>\r
- </tr>\r
- <tr>\r
-  <td>Nicaragua</td>\r
-  <td>1295</td>\r
-  <td>5743</td>\r
-  <td>6265</td>\r
-  <td>7058</td>\r
-  <td>8143</td>\r
- </tr>\r
- <tr>\r
-  <td>Niger</td>\r
-  <td>2462</td>\r
-  <td>15290</td>\r
-  <td>19150</td>\r
-  <td>27388</td>\r
-  <td>58216</td>\r
- </tr>\r
- <tr>\r
-  <td>Nigeria</td>\r
-  <td>36680</td>\r
-  <td>154729</td>\r
-  <td>175928</td>\r
-  <td>210057</td>\r
-  <td>289083</td>\r
- </tr>\r
- <tr>\r
-  <td>Niue</td>\r
-  <td>5</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
- </tr>\r
- <tr>\r
-  <td>Northern Mariana Islands</td>\r
-  <td>7</td>\r
-  <td>87</td>\r
-  <td>96</td>\r
-  <td>111</td>\r
-  <td>151</td>\r
- </tr>\r
- <tr>\r
-  <td>Norway</td>\r
-  <td>3265</td>\r
-  <td>4812</td>\r
-  <td>5036</td>\r
-  <td>5365</td>\r
-  <td>5947</td>\r
- </tr>\r
- <tr>\r
-  <td>Occupied Palestinian Territory</td>\r
-  <td>1005</td>\r
-  <td>4277</td>\r
-  <td>5090</td>\r
-  <td>6553</td>\r
-  <td>10265</td>\r
- </tr>\r
- <tr>\r
-  <td>Oman</td>\r
-  <td>456</td>\r
-  <td>2845</td>\r
-  <td>3198</td>\r
-  <td>3782</td>\r
-  <td>4878</td>\r
- </tr>\r
- <tr>\r
-  <td>Pakistan</td>\r
-  <td>41177</td>\r
-  <td>180808</td>\r
-  <td>205504</td>\r
-  <td>246286</td>\r
-  <td>335195</td>\r
- </tr>\r
- <tr>\r
-  <td>Palau</td>\r
-  <td>7</td>\r
-  <td>20</td>\r
-  <td>21</td>\r
-  <td>23</td>\r
-  <td>26</td>\r
- </tr>\r
- <tr>\r
-  <td>Panama</td>\r
-  <td>860</td>\r
-  <td>3454</td>\r
-  <td>3773</td>\r
-  <td>4267</td>\r
-  <td>5092</td>\r
- </tr>\r
- <tr>\r
-  <td>Papua New Guinea</td>\r
-  <td>1798</td>\r
-  <td>6732</td>\r
-  <td>7678</td>\r
-  <td>9265</td>\r
-  <td>12871</td>\r
- </tr>\r
- <tr>\r
-  <td>Paraguay</td>\r
-  <td>1473</td>\r
-  <td>6349</td>\r
-  <td>7007</td>\r
-  <td>8026</td>\r
-  <td>9867</td>\r
- </tr>\r
- <tr>\r
-  <td>Peru</td>\r
-  <td>7632</td>\r
-  <td>29165</td>\r
-  <td>31197</td>\r
-  <td>34528</td>\r
-  <td>39776</td>\r
- </tr>\r
- <tr>\r
-  <td>Philippines</td>\r
-  <td>19996</td>\r
-  <td>91983</td>\r
-  <td>101734</td>\r
-  <td>117270</td>\r
-  <td>146156</td>\r
- </tr>\r
- <tr>\r
-  <td>Pitcairn</td>\r
-  <td>0</td>\r
-  <td>0</td>\r
-  <td>0</td>\r
-  <td>0</td>\r
-  <td>0</td>\r
- </tr>\r
- <tr>\r
-  <td>Poland</td>\r
-  <td>24824</td>\r
-  <td>38074</td>\r
-  <td>37788</td>\r
-  <td>36964</td>\r
-  <td>32013</td>\r
- </tr>\r
- <tr>\r
-  <td>Portugal</td>\r
-  <td>8405</td>\r
-  <td>10707</td>\r
-  <td>10787</td>\r
-  <td>10706</td>\r
-  <td>10015</td>\r
- </tr>\r
- <tr>\r
-  <td>Puerto Rico</td>\r
-  <td>2218</td>\r
-  <td>3982</td>\r
-  <td>4074</td>\r
-  <td>4176</td>\r
-  <td>4103</td>\r
- </tr>\r
- <tr>\r
-  <td>Qatar</td>\r
-  <td>25</td>\r
-  <td>1409</td>\r
-  <td>1630</td>\r
-  <td>1848</td>\r
-  <td>2316</td>\r
- </tr>\r
- <tr>\r
-  <td>Republic of Korea</td>\r
-  <td>19211</td>\r
-  <td>48333</td>\r
-  <td>49153</td>\r
-  <td>49484</td>\r
-  <td>44077</td>\r
- </tr>\r
- <tr>\r
-  <td>Réunion</td>\r
-  <td>248</td>\r
-  <td>827</td>\r
-  <td>886</td>\r
-  <td>973</td>\r
-  <td>1096</td>\r
- </tr>\r
- <tr>\r
-  <td>Romania</td>\r
-  <td>16311</td>\r
-  <td>21275</td>\r
-  <td>20787</td>\r
-  <td>19961</td>\r
-  <td>17279</td>\r
- </tr>\r
- <tr>\r
-  <td>Russian Federation</td>\r
-  <td>102702</td>\r
-  <td>140874</td>\r
-  <td>137983</td>\r
-  <td>132345</td>\r
-  <td>116097</td>\r
- </tr>\r
- <tr>\r
-  <td>Rwanda</td>\r
-  <td>2162</td>\r
-  <td>9998</td>\r
-  <td>11743</td>\r
-  <td>14676</td>\r
-  <td>22082</td>\r
- </tr>\r
- <tr>\r
-  <td>Saint Helena</td>\r
-  <td>5</td>\r
-  <td>4</td>\r
-  <td>4</td>\r
-  <td>5</td>\r
-  <td>5</td>\r
- </tr>\r
- <tr>\r
-  <td>Saint Kitts and Nevis</td>\r
-  <td>46</td>\r
-  <td>52</td>\r
-  <td>56</td>\r
-  <td>61</td>\r
-  <td>69</td>\r
- </tr>\r
- <tr>\r
-  <td>Saint Lucia</td>\r
-  <td>83</td>\r
-  <td>172</td>\r
-  <td>182</td>\r
-  <td>198</td>\r
-  <td>217</td>\r
- </tr>\r
- <tr>\r
-  <td>Saint Pierre and Miquelon</td>\r
-  <td>5</td>\r
-  <td>6</td>\r
-  <td>6</td>\r
-  <td>6</td>\r
-  <td>6</td>\r
- </tr>\r
- <tr>\r
-  <td>St. Vincent and the Grenadines</td>\r
-  <td>67</td>\r
-  <td>109</td>\r
-  <td>110</td>\r
-  <td>111</td>\r
-  <td>119</td>\r
- </tr>\r
- <tr>\r
-  <td>Samoa</td>\r
-  <td>82</td>\r
-  <td>179</td>\r
-  <td>181</td>\r
-  <td>188</td>\r
-  <td>192</td>\r
- </tr>\r
- <tr>\r
-  <td>San Marino</td>\r
-  <td>13</td>\r
-  <td>31</td>\r
-  <td>32</td>\r
-  <td>33</td>\r
-  <td>33</td>\r
- </tr>\r
- <tr>\r
-  <td>Sao Tome and Principe</td>\r
-  <td>60</td>\r
-  <td>163</td>\r
-  <td>180</td>\r
-  <td>216</td>\r
-  <td>296</td>\r
- </tr>\r
- <tr>\r
-  <td>Saudi Arabia</td>\r
-  <td>3201</td>\r
-  <td>25721</td>\r
-  <td>28933</td>\r
-  <td>34176</td>\r
-  <td>43658</td>\r
- </tr>\r
- <tr>\r
-  <td>Senegal</td>\r
-  <td>2416</td>\r
-  <td>12534</td>\r
-  <td>14526</td>\r
-  <td>17861</td>\r
-  <td>26102</td>\r
- </tr>\r
- <tr>\r
-  <td>Serbia</td>\r
-  <td>6732</td>\r
-  <td>9850</td>\r
-  <td>9828</td>\r
-  <td>9720</td>\r
-  <td>9193</td>\r
- </tr>\r
- <tr>\r
-  <td>Seychelles</td>\r
-  <td>36</td>\r
-  <td>84</td>\r
-  <td>86</td>\r
-  <td>91</td>\r
-  <td>97</td>\r
- </tr>\r
- <tr>\r
-  <td>Sierra Leone</td>\r
-  <td>1944</td>\r
-  <td>5696</td>\r
-  <td>6557</td>\r
-  <td>8112</td>\r
-  <td>12446</td>\r
- </tr>\r
- <tr>\r
-  <td>Singapore</td>\r
-  <td>1022</td>\r
-  <td>4737</td>\r
-  <td>5059</td>\r
-  <td>5362</td>\r
-  <td>5221</td>\r
- </tr>\r
- <tr>\r
-  <td>Slovakia</td>\r
-  <td>3463</td>\r
-  <td>5406</td>\r
-  <td>5437</td>\r
-  <td>5413</td>\r
-  <td>4917</td>\r
- </tr>\r
- <tr>\r
-  <td>Slovenia</td>\r
-  <td>1473</td>\r
-  <td>2020</td>\r
-  <td>2044</td>\r
-  <td>2050</td>\r
-  <td>1954</td>\r
- </tr>\r
- <tr>\r
-  <td>Solomon Islands</td>\r
-  <td>90</td>\r
-  <td>523</td>\r
-  <td>599</td>\r
-  <td>725</td>\r
-  <td>1007</td>\r
- </tr>\r
- <tr>\r
-  <td>Somalia</td>\r
-  <td>2264</td>\r
-  <td>9133</td>\r
-  <td>10731</td>\r
-  <td>13922</td>\r
-  <td>23522</td>\r
- </tr>\r
- <tr>\r
-  <td>South Africa</td>\r
-  <td>13683</td>\r
-  <td>50110</td>\r
-  <td>51684</td>\r
-  <td>53766</td>\r
-  <td>56802</td>\r
- </tr>\r
- <tr>\r
-  <td>Spain</td>\r
-  <td>28009</td>\r
-  <td>44904</td>\r
-  <td>47203</td>\r
-  <td>49265</td>\r
-  <td>51260</td>\r
- </tr>\r
- <tr>\r
-  <td>Sri Lanka</td>\r
-  <td>8241</td>\r
-  <td>20238</td>\r
-  <td>21167</td>\r
-  <td>22033</td>\r
-  <td>21705</td>\r
- </tr>\r
- <tr>\r
-  <td>Sudan</td>\r
-  <td>9190</td>\r
-  <td>42272</td>\r
-  <td>47730</td>\r
-  <td>56688</td>\r
-  <td>75884</td>\r
- </tr>\r
- <tr>\r
-  <td>Suriname</td>\r
-  <td>215</td>\r
-  <td>520</td>\r
-  <td>547</td>\r
-  <td>586</td>\r
-  <td>619</td>\r
- </tr>\r
- <tr>\r
-  <td>Swaziland</td>\r
-  <td>273</td>\r
-  <td>1185</td>\r
-  <td>1287</td>\r
-  <td>1455</td>\r
-  <td>1749</td>\r
- </tr>\r
- <tr>\r
-  <td>Sweden</td>\r
-  <td>7014</td>\r
-  <td>9249</td>\r
-  <td>9498</td>\r
-  <td>9915</td>\r
-  <td>10571</td>\r
- </tr>\r
- <tr>\r
-  <td>Switzerland</td>\r
-  <td>4693</td>\r
-  <td>7568</td>\r
-  <td>7736</td>\r
-  <td>8020</td>\r
-  <td>8514</td>\r
- </tr>\r
- <tr>\r
-  <td>Syrian Arab Republic</td>\r
-  <td>3536</td>\r
-  <td>21906</td>\r
-  <td>24494</td>\r
-  <td>28592</td>\r
-  <td>36911</td>\r
- </tr>\r
- <tr>\r
-  <td>Tajikistan</td>\r
-  <td>1532</td>\r
-  <td>6952</td>\r
-  <td>7761</td>\r
-  <td>9075</td>\r
-  <td>11111</td>\r
- </tr>\r
- <tr>\r
-  <td>TFYR Macedonia</td>\r
-  <td>1230</td>\r
-  <td>2042</td>\r
-  <td>2045</td>\r
-  <td>2037</td>\r
-  <td>1857</td>\r
- </tr>\r
- <tr>\r
-  <td>Thailand</td>\r
-  <td>20607</td>\r
-  <td>67764</td>\r
-  <td>69939</td>\r
-  <td>72628</td>\r
-  <td>73361</td>\r
- </tr>\r
- <tr>\r
-  <td>Timor-Leste</td>\r
-  <td>433</td>\r
-  <td>1134</td>\r
-  <td>1385</td>\r
-  <td>1869</td>\r
-  <td>3217</td>\r
- </tr>\r
- <tr>\r
-  <td>Togo</td>\r
-  <td>1329</td>\r
-  <td>6619</td>\r
-  <td>7607</td>\r
-  <td>9282</td>\r
-  <td>13196</td>\r
- </tr>\r
- <tr>\r
-  <td>Tokelau</td>\r
-  <td>2</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
- </tr>\r
- <tr>\r
-  <td>Tonga</td>\r
-  <td>47</td>\r
-  <td>104</td>\r
-  <td>105</td>\r
-  <td>112</td>\r
-  <td>123</td>\r
- </tr>\r
- <tr>\r
-  <td>Trinidad and Tobago</td>\r
-  <td>636</td>\r
-  <td>1339</td>\r
-  <td>1368</td>\r
-  <td>1388</td>\r
-  <td>1278</td>\r
- </tr>\r
- <tr>\r
-  <td>Tunisia</td>\r
-  <td>3530</td>\r
-  <td>10272</td>\r
-  <td>10884</td>\r
-  <td>11797</td>\r
-  <td>12711</td>\r
- </tr>\r
- <tr>\r
-  <td>Turkey</td>\r
-  <td>21484</td>\r
-  <td>74816</td>\r
-  <td>79966</td>\r
-  <td>87364</td>\r
-  <td>97389</td>\r
- </tr>\r
- <tr>\r
-  <td>Turkmenistan</td>\r
-  <td>1211</td>\r
-  <td>5110</td>\r
-  <td>5509</td>\r
-  <td>6072</td>\r
-  <td>6796</td>\r
- </tr>\r
- <tr>\r
-  <td>Turks and Caicos Islands</td>\r
-  <td>5</td>\r
-  <td>33</td>\r
-  <td>35</td>\r
-  <td>38</td>\r
-  <td>40</td>\r
- </tr>\r
- <tr>\r
-  <td>Tuvalu</td>\r
-  <td>5</td>\r
-  <td>10</td>\r
-  <td>10</td>\r
-  <td>11</td>\r
-  <td>11</td>\r
- </tr>\r
- <tr>\r
-  <td>Uganda</td>\r
-  <td>5158</td>\r
-  <td>32710</td>\r
-  <td>39710</td>\r
-  <td>53406</td>\r
-  <td>91271</td>\r
- </tr>\r
- <tr>\r
-  <td>Ukraine</td>\r
-  <td>37298</td>\r
-  <td>45708</td>\r
-  <td>44165</td>\r
-  <td>41617</td>\r
-  <td>35026</td>\r
- </tr>\r
- <tr>\r
-  <td>United Arab Emirates</td>\r
-  <td>70</td>\r
-  <td>4599</td>\r
-  <td>5193</td>\r
-  <td>6109</td>\r
-  <td>8253</td>\r
- </tr>\r
- <tr>\r
-  <td>United Kingdom</td>\r
-  <td>50616</td>\r
-  <td>61565</td>\r
-  <td>63528</td>\r
-  <td>66601</td>\r
-  <td>72365</td>\r
- </tr>\r
- <tr>\r
-  <td>United Republic of Tanzania</td>\r
-  <td>7650</td>\r
-  <td>43739</td>\r
-  <td>52109</td>\r
-  <td>67394</td>\r
-  <td>109450</td>\r
- </tr>\r
- <tr>\r
-  <td>United States of America</td>\r
-  <td>157813</td>\r
-  <td>314659</td>\r
-  <td>332334</td>\r
-  <td>358735</td>\r
-  <td>403932</td>\r
- </tr>\r
- <tr>\r
-  <td>United States Virgin Islands</td>\r
-  <td>27</td>\r
-  <td>110</td>\r
-  <td>108</td>\r
-  <td>103</td>\r
-  <td>75</td>\r
- </tr>\r
- <tr>\r
-  <td>Uruguay</td>\r
-  <td>2239</td>\r
-  <td>3361</td>\r
-  <td>3430</td>\r
-  <td>3546</td>\r
-  <td>3637</td>\r
- </tr>\r
- <tr>\r
-  <td>Uzbekistan</td>\r
-  <td>6314</td>\r
-  <td>27488</td>\r
-  <td>29456</td>\r
-  <td>32715</td>\r
-  <td>36439</td>\r
- </tr>\r
- <tr>\r
-  <td>Vanuatu</td>\r
-  <td>48</td>\r
-  <td>240</td>\r
-  <td>276</td>\r
-  <td>338</td>\r
-  <td>482</td>\r
- </tr>\r
- <tr>\r
-  <td>Venezuela (Bolivarian Republic of)</td>\r
-  <td>5094</td>\r
-  <td>28583</td>\r
-  <td>31292</td>\r
-  <td>35370</td>\r
-  <td>42042</td>\r
- </tr>\r
- <tr>\r
-  <td>Viet Nam</td>\r
-  <td>27367</td>\r
-  <td>88069</td>\r
-  <td>93647</td>\r
-  <td>102054</td>\r
-  <td>111666</td>\r
- </tr>\r
- <tr>\r
-  <td>Wallis and Futuna Islands</td>\r
-  <td>7</td>\r
-  <td>15</td>\r
-  <td>16</td>\r
-  <td>17</td>\r
-  <td>17</td>\r
- </tr>\r
- <tr>\r
-  <td>Western Sahara</td>\r
-  <td>14</td>\r
-  <td>513</td>\r
-  <td>625</td>\r
-  <td>775</td>\r
-  <td>938</td>\r
- </tr>\r
- <tr>\r
-  <td>Yemen</td>\r
-  <td>4316</td>\r
-  <td>23580</td>\r
-  <td>27819</td>\r
-  <td>35509</td>\r
-  <td>53689</td>\r
- </tr>\r
- <tr>\r
-  <td>Zambia</td>\r
-  <td>2340</td>\r
-  <td>12935</td>\r
-  <td>14980</td>\r
-  <td>18890</td>\r
-  <td>28957</td>\r
- </tr>\r
- <tr>\r
-  <td>Zimbabwe</td>\r
-  <td>2747</td>\r
-  <td>12523</td>\r
-  <td>14029</td>\r
-  <td>16780</td>\r
-  <td>22178</td>\r
- </tr>\r
+ <tr>  <td>Afghanistan</td>  <td>8151</td>  <td>28150</td>  <td>34246</td>  <td>44970</td>  <td>73938</td> </tr>\r
+ <tr>  <td>Albania</td>  <td>1215</td>  <td>3155</td>  <td>3256</td>  <td>3395</td>  <td>3303</td> </tr>\r
+ <tr>  <td>Algeria</td>  <td>8753</td>  <td>34895</td>  <td>38088</td>  <td>42882</td>  <td>49610</td> </tr>\r
+ <tr>  <td>American Samoa</td>  <td>19</td>  <td>67</td>  <td>74</td>  <td>86</td>  <td>107</td> </tr>\r
+ <tr>  <td>Andorra</td>  <td>6</td>  <td>86</td>  <td>93</td>  <td>107</td>  <td>137</td> </tr>\r
+ <tr>  <td>Angola</td>  <td>4148</td>  <td>18498</td>  <td>21690</td>  <td>27441</td>  <td>42267</td> </tr>\r
+ <tr>  <td>Anguilla</td>  <td>5</td>  <td>15</td>  <td>17</td>  <td>18</td>  <td>20</td> </tr>\r
+ <tr>  <td>Antigua and Barbuda</td>  <td>46</td>  <td>88</td>  <td>93</td>  <td>101</td>  <td>112</td> </tr>\r
+ <tr>  <td>Argentina</td>  <td>17150</td>  <td>40276</td>  <td>42548</td>  <td>45883</td>  <td>50943</td> </tr>\r
+ <tr>  <td>Armenia</td>  <td>1354</td>  <td>3083</td>  <td>3139</td>  <td>3181</td>  <td>3018</td> </tr>\r
+ <tr>  <td>Aruba</td>  <td>38</td>  <td>107</td>  <td>109</td>  <td>112</td>  <td>106</td> </tr>\r
+ <tr>  <td>Australia</td>  <td>8219</td>  <td>21293</td>  <td>22607</td>  <td>24703</td>  <td>28724</td> </tr>\r
+ <tr>  <td>Austria</td>  <td>6936</td>  <td>8364</td>  <td>8467</td>  <td>8600</td>  <td>8515</td> </tr>\r
+ <tr>  <td>Azerbaijan</td>  <td>2896</td>  <td>8832</td>  <td>9426</td>  <td>10128</td>  <td>10579</td> </tr>\r
+ <tr>  <td>Bahamas</td>  <td>79</td>  <td>342</td>  <td>366</td>  <td>402</td>  <td>455</td> </tr>\r
+ <tr>  <td>Bahrain</td>  <td>116</td>  <td>791</td>  <td>882</td>  <td>1021</td>  <td>1277</td> </tr>\r
+ <tr>  <td>Bangladesh</td>  <td>43595</td>  <td>162221</td>  <td>175217</td>  <td>195012</td>  <td>222495</td> </tr>\r
+ <tr>  <td>Barbados</td>  <td>211</td>  <td>256</td>  <td>260</td>  <td>262</td>  <td>237</td> </tr>\r
+ <tr>  <td>Belarus</td>  <td>7745</td>  <td>9634</td>  <td>9355</td>  <td>8851</td>  <td>7275</td> </tr>\r
+ <tr>  <td>Belgium</td>  <td>8628</td>  <td>10647</td>  <td>10878</td>  <td>11191</td>  <td>11493</td> </tr>\r
+ <tr>  <td>Belize</td>  <td>69</td>  <td>307</td>  <td>344</td>  <td>404</td>  <td>506</td> </tr>\r
+ <tr>  <td>Benin</td>  <td>2050</td>  <td>8935</td>  <td>10647</td>  <td>13767</td>  <td>21982</td> </tr>\r
+ <tr>  <td>Bermuda</td>  <td>37</td>  <td>65</td>  <td>65</td>  <td>66</td>  <td>63</td> </tr>\r
+ <tr>  <td>Bhutan</td>  <td>168</td>  <td>697</td>  <td>770</td>  <td>865</td>  <td>1013</td> </tr>\r
+ <tr>  <td>Bolivia</td>  <td>2714</td>  <td>9863</td>  <td>10854</td>  <td>12368</td>  <td>14908</td> </tr>\r
+ <tr>  <td>Bosnia and Herzegovina</td>  <td>2661</td>  <td>3767</td>  <td>3727</td>  <td>3608</td>  <td>3008</td> </tr>\r
+ <tr>  <td>Botswana</td>  <td>413</td>  <td>1950</td>  <td>2106</td>  <td>2337</td>  <td>2758</td> </tr>\r
+ <tr>  <td>Brazil</td>  <td>53975</td>  <td>193734</td>  <td>202866</td>  <td>213802</td>  <td>218512</td> </tr>\r
+ <tr>  <td>British Virgin Islands</td>  <td>7</td>  <td>23</td>  <td>24</td>  <td>26</td>  <td>28</td> </tr>\r
+ <tr>  <td>Brunei Darussalam</td>  <td>48</td>  <td>400</td>  <td>443</td>  <td>513</td>  <td>658</td> </tr>\r
+ <tr>  <td>Bulgaria</td>  <td>7251</td>  <td>7545</td>  <td>7263</td>  <td>6752</td>  <td>5392</td> </tr>\r
+ <tr>  <td>Burkina Faso</td>  <td>4080</td>  <td>15757</td>  <td>19013</td>  <td>24837</td>  <td>40830</td> </tr>\r
+ <tr>  <td>Burundi</td>  <td>2456</td>  <td>8303</td>  <td>9413</td>  <td>11161</td>  <td>14846</td> </tr>\r
+ <tr>  <td>Cambodia</td>  <td>4346</td>  <td>14805</td>  <td>16357</td>  <td>18973</td>  <td>23795</td> </tr>\r
+ <tr>  <td>Cameroon</td>  <td>4466</td>  <td>19522</td>  <td>22169</td>  <td>26478</td>  <td>36736</td> </tr>\r
+ <tr>  <td>Canada</td>  <td>13737</td>  <td>33573</td>  <td>35493</td>  <td>38659</td>  <td>44414</td> </tr>\r
+ <tr>  <td>Cape Verde</td>  <td>146</td>  <td>506</td>  <td>548</td>  <td>616</td>  <td>703</td> </tr>\r
+ <tr>  <td>Cayman Islands</td>  <td>7</td>  <td>56</td>  <td>59</td>  <td>63</td>  <td>66</td> </tr>\r
+ <tr>  <td>Central African Republic</td>  <td>1327</td>  <td>4422</td>  <td>4927</td>  <td>5747</td>  <td>7603</td> </tr>\r
+ <tr>  <td>Chad</td>  <td>2429</td>  <td>11206</td>  <td>13120</td>  <td>16906</td>  <td>27776</td> </tr>\r
+ <tr>  <td>Channel Islands</td>  <td>102</td>  <td>150</td>  <td>151</td>  <td>152</td>  <td>144</td> </tr>\r
+ <tr>  <td>Chile</td>  <td>6082</td>  <td>16970</td>  <td>17926</td>  <td>19266</td>  <td>20657</td> </tr>\r
+ <tr>  <td>China</td>  <td>544951</td>  <td>1345751</td>  <td>1395998</td>  <td>1453140</td>  <td>1417045</td> </tr>\r
+ <tr>  <td>China, Hong Kong SAR</td>  <td>1974</td>  <td>7022</td>  <td>7398</td>  <td>7969</td>  <td>8623</td> </tr>\r
+ <tr>  <td>China, Macao SAR</td>  <td>190</td>  <td>538</td>  <td>568</td>  <td>603</td>  <td>593</td> </tr>\r
+ <tr>  <td>Colombia</td>  <td>12000</td>  <td>45660</td>  <td>49385</td>  <td>54920</td>  <td>62877</td> </tr>\r
+ <tr>  <td>Comoros</td>  <td>156</td>  <td>676</td>  <td>767</td>  <td>907</td>  <td>1226</td> </tr>\r
+ <tr>  <td>Congo</td>  <td>808</td>  <td>3683</td>  <td>4225</td>  <td>5094</td>  <td>6863</td> </tr>\r
+ <tr>  <td>Cook Islands</td>  <td>15</td>  <td>20</td>  <td>20</td>  <td>21</td>  <td>24</td> </tr>\r
+ <tr>  <td>Costa Rica</td>  <td>966</td>  <td>4579</td>  <td>4957</td>  <td>5521</td>  <td>6373</td> </tr>\r
+ <tr>  <td>Côte d'Ivoire</td>  <td>2505</td>  <td>21075</td>  <td>24210</td>  <td>29738</td>  <td>43373</td> </tr>\r
+ <tr>  <td>Croatia</td>  <td>3850</td>  <td>4416</td>  <td>4370</td>  <td>4254</td>  <td>3825</td> </tr>\r
+ <tr>  <td>Cuba</td>  <td>5920</td>  <td>11204</td>  <td>11213</td>  <td>11148</td>  <td>9725</td> </tr>\r
+ <tr>  <td>Cyprus</td>  <td>494</td>  <td>871</td>  <td>925</td>  <td>1014</td>  <td>1175</td> </tr>\r
+ <tr>  <td>Czech Republic</td>  <td>8925</td>  <td>10369</td>  <td>10510</td>  <td>10573</td>  <td>10294</td> </tr>\r
+ <tr>  <td>Dem. People's Rep. of Korea</td>  <td>9737</td>  <td>23906</td>  <td>24399</td>  <td>25128</td>  <td>24562</td> </tr>\r
+ <tr>  <td>Dem. Republic of the Congo</td>  <td>12184</td>  <td>66020</td>  <td>77419</td>  <td>98123</td>  <td>147512</td> </tr>\r
+ <tr>  <td>Denmark</td>  <td>4271</td>  <td>5470</td>  <td>5523</td>  <td>5590</td>  <td>5551</td> </tr>\r
+ <tr>  <td>Djibouti</td>  <td>62</td>  <td>864</td>  <td>953</td>  <td>1111</td>  <td>1469</td> </tr>\r
+ <tr>  <td>Dominica</td>  <td>51</td>  <td>67</td>  <td>67</td>  <td>68</td>  <td>66</td> </tr>\r
+ <tr>  <td>Dominican Republic</td>  <td>2427</td>  <td>10090</td>  <td>10867</td>  <td>11973</td>  <td>13441</td> </tr>\r
+ <tr>  <td>Ecuador</td>  <td>3387</td>  <td>13625</td>  <td>14596</td>  <td>16074</td>  <td>17989</td> </tr>\r
+ <tr>  <td>Egypt</td>  <td>21514</td>  <td>82999</td>  <td>91778</td>  <td>104970</td>  <td>129533</td> </tr>\r
+ <tr>  <td>El Salvador</td>  <td>2200</td>  <td>6163</td>  <td>6383</td>  <td>6895</td>  <td>7882</td> </tr>\r
+ <tr>  <td>Equatorial Guinea</td>  <td>226</td>  <td>676</td>  <td>781</td>  <td>971</td>  <td>1445</td> </tr>\r
+ <tr>  <td>Eritrea</td>  <td>1141</td>  <td>5073</td>  <td>6009</td>  <td>7404</td>  <td>10787</td> </tr>\r
+ <tr>  <td>Estonia</td>  <td>1101</td>  <td>1340</td>  <td>1337</td>  <td>1321</td>  <td>1233</td> </tr>\r
+ <tr>  <td>Ethiopia</td>  <td>18434</td>  <td>82825</td>  <td>96237</td>  <td>119822</td>  <td>173811</td> </tr>\r
+ <tr>  <td>Faeroe Islands</td>  <td>32</td>  <td>50</td>  <td>52</td>  <td>55</td>  <td>58</td> </tr>\r
+ <tr>  <td>Falkland Islands (Malvinas)</td>  <td>2</td>  <td>3</td>  <td>3</td>  <td>3</td>  <td>3</td> </tr>\r
+ <tr>  <td>Fiji</td>  <td>289</td>  <td>849</td>  <td>874</td>  <td>905</td>  <td>910</td> </tr>\r
+ <tr>  <td>Finland</td>  <td>4009</td>  <td>5326</td>  <td>5432</td>  <td>5533</td>  <td>5445</td> </tr>\r
+ <tr>  <td>France</td>  <td>41832</td>  <td>62343</td>  <td>63900</td>  <td>65769</td>  <td>67668</td> </tr>\r
+ <tr>  <td>French Guiana</td>  <td>25</td>  <td>226</td>  <td>261</td>  <td>323</td>  <td>462</td> </tr>\r
+ <tr>  <td>French Polynesia</td>  <td>61</td>  <td>269</td>  <td>289</td>  <td>318</td>  <td>354</td> </tr>\r
+ <tr>  <td>Gabon</td>  <td>469</td>  <td>1475</td>  <td>1639</td>  <td>1915</td>  <td>2471</td> </tr>\r
+ <tr>  <td>Gambia</td>  <td>258</td>  <td>1705</td>  <td>1985</td>  <td>2478</td>  <td>3763</td> </tr>\r
+ <tr>  <td>Georgia</td>  <td>3527</td>  <td>4260</td>  <td>4084</td>  <td>3888</td>  <td>3267</td> </tr>\r
+ <tr>  <td>Germany</td>  <td>68376</td>  <td>82167</td>  <td>81346</td>  <td>79258</td>  <td>70504</td> </tr>\r
+ <tr>  <td>Ghana</td>  <td>4981</td>  <td>23837</td>  <td>26925</td>  <td>32233</td>  <td>45213</td> </tr>\r
+ <tr>  <td>Gibraltar</td>  <td>20</td>  <td>31</td>  <td>31</td>  <td>32</td>  <td>30</td> </tr>\r
+ <tr>  <td>Greece</td>  <td>7566</td>  <td>11161</td>  <td>11261</td>  <td>11274</td>  <td>10939</td> </tr>\r
+ <tr>  <td>Greenland</td>  <td>23</td>  <td>57</td>  <td>57</td>  <td>56</td>  <td>50</td> </tr>\r
+ <tr>  <td>Grenada</td>  <td>77</td>  <td>104</td>  <td>107</td>  <td>109</td>  <td>97</td> </tr>\r
+ <tr>  <td>Guadeloupe</td>  <td>210</td>  <td>465</td>  <td>476</td>  <td>489</td>  <td>477</td> </tr>\r
+ <tr>  <td>Guam</td>  <td>60</td>  <td>178</td>  <td>191</td>  <td>211</td>  <td>242</td> </tr>\r
+ <tr>  <td>Guatemala</td>  <td>3146</td>  <td>14027</td>  <td>16227</td>  <td>19927</td>  <td>27480</td> </tr>\r
+ <tr>  <td>Guinea</td>  <td>2619</td>  <td>10069</td>  <td>11844</td>  <td>15158</td>  <td>23975</td> </tr>\r
+ <tr>  <td>Guinea-Bissau</td>  <td>518</td>  <td>1611</td>  <td>1848</td>  <td>2296</td>  <td>3555</td> </tr>\r
+ <tr>  <td>Guyana</td>  <td>423</td>  <td>762</td>  <td>754</td>  <td>732</td>  <td>558</td> </tr>\r
+ <tr>  <td>Haiti</td>  <td>3221</td>  <td>10033</td>  <td>10957</td>  <td>12476</td>  <td>15485</td> </tr>\r
+ <tr>  <td>Holy See</td>  <td>1</td>  <td>1</td>  <td>1</td>  <td>1</td>  <td>1</td> </tr>\r
+ <tr>  <td>Honduras</td>  <td>1487</td>  <td>7466</td>  <td>8386</td>  <td>9844</td>  <td>12402</td> </tr>\r
+ <tr>  <td>Hungary</td>  <td>9338</td>  <td>9993</td>  <td>9874</td>  <td>9647</td>  <td>8934</td> </tr>\r
+ <tr>  <td>Iceland</td>  <td>143</td>  <td>323</td>  <td>353</td>  <td>384</td>  <td>407</td> </tr>\r
+ <tr>  <td>India</td>  <td>371857</td>  <td>1198003</td>  <td>1294192</td>  <td>1431272</td>  <td>1613800</td> </tr>\r
+ <tr>  <td>Indonesia</td>  <td>77152</td>  <td>229965</td>  <td>244191</td>  <td>263287</td>  <td>288110</td> </tr>\r
+ <tr>  <td>Iran (Islamic Republic of)</td>  <td>16913</td>  <td>74196</td>  <td>79454</td>  <td>87134</td>  <td>96975</td> </tr>\r
+ <tr>  <td>Iraq</td>  <td>5719</td>  <td>30747</td>  <td>35884</td>  <td>44692</td>  <td>63995</td> </tr>\r
+ <tr>  <td>Ireland</td>  <td>2969</td>  <td>4515</td>  <td>4886</td>  <td>5370</td>  <td>6295</td> </tr>\r
+ <tr>  <td>Isle of Man</td>  <td>55</td>  <td>80</td>  <td>81</td>  <td>80</td>  <td>75</td> </tr>\r
+ <tr>  <td>Israel</td>  <td>1258</td>  <td>7170</td>  <td>7823</td>  <td>8769</td>  <td>10649</td> </tr>\r
+ <tr>  <td>Italy</td>  <td>46367</td>  <td>59870</td>  <td>60604</td>  <td>60018</td>  <td>57066</td> </tr>\r
+ <tr>  <td>Jamaica</td>  <td>1403</td>  <td>2719</td>  <td>2786</td>  <td>2866</td>  <td>2683</td> </tr>\r
+ <tr>  <td>Japan</td>  <td>82824</td>  <td>127156</td>  <td>125791</td>  <td>120793</td>  <td>101659</td> </tr>\r
+ <tr>  <td>Jordan</td>  <td>472</td>  <td>6316</td>  <td>6957</td>  <td>8088</td>  <td>10241</td> </tr>\r
+ <tr>  <td>Kazakhstan</td>  <td>6703</td>  <td>15637</td>  <td>16289</td>  <td>17025</td>  <td>17848</td> </tr>\r
+ <tr>  <td>Kenya</td>  <td>6077</td>  <td>39802</td>  <td>46433</td>  <td>57573</td>  <td>85410</td> </tr>\r
+ <tr>  <td>Kiribati</td>  <td>26</td>  <td>98</td>  <td>107</td>  <td>123</td>  <td>151</td> </tr>\r
+ <tr>  <td>Kuwait</td>  <td>152</td>  <td>2985</td>  <td>3378</td>  <td>3988</td>  <td>5240</td> </tr>\r
+ <tr>  <td>Kyrgyzstan</td>  <td>1740</td>  <td>5482</td>  <td>5877</td>  <td>6378</td>  <td>6882</td> </tr>\r
+ <tr>  <td>Lao People's Dem. Republic</td>  <td>1666</td>  <td>6320</td>  <td>7028</td>  <td>8273</td>  <td>10744</td> </tr>\r
+ <tr>  <td>Latvia</td>  <td>1949</td>  <td>2249</td>  <td>2197</td>  <td>2101</td>  <td>1854</td> </tr>\r
+ <tr>  <td>Lebanon</td>  <td>1443</td>  <td>4224</td>  <td>4426</td>  <td>4736</td>  <td>5033</td> </tr>\r
+ <tr>  <td>Lesotho</td>  <td>734</td>  <td>2067</td>  <td>2168</td>  <td>2306</td>  <td>2491</td> </tr>\r
+ <tr>  <td>Liberia</td>  <td>824</td>  <td>3955</td>  <td>4665</td>  <td>5858</td>  <td>8841</td> </tr>\r
+ <tr>  <td>Libyan Arab Jamahiriya</td>  <td>1029</td>  <td>6420</td>  <td>7158</td>  <td>8144</td>  <td>9819</td> </tr>\r
+ <tr>  <td>Liechtenstein</td>  <td>14</td>  <td>36</td>  <td>38</td>  <td>40</td>  <td>45</td> </tr>\r
+ <tr>  <td>Lithuania</td>  <td>2567</td>  <td>3287</td>  <td>3143</td>  <td>2985</td>  <td>2579</td> </tr>\r
+ <tr>  <td>Luxembourg</td>  <td>296</td>  <td>486</td>  <td>520</td>  <td>582</td>  <td>733</td> </tr>\r
+ <tr>  <td>Madagascar</td>  <td>4084</td>  <td>19625</td>  <td>22853</td>  <td>28595</td>  <td>42693</td> </tr>\r
+ <tr>  <td>Malawi</td>  <td>2881</td>  <td>15263</td>  <td>17998</td>  <td>23194</td>  <td>36575</td> </tr>\r
+ <tr>  <td>Malaysia</td>  <td>6110</td>  <td>27468</td>  <td>30041</td>  <td>33770</td>  <td>39664</td> </tr>\r
+ <tr>  <td>Maldives</td>  <td>82</td>  <td>309</td>  <td>338</td>  <td>384</td>  <td>455</td> </tr>\r
+ <tr>  <td>Mali</td>  <td>4268</td>  <td>13010</td>  <td>14993</td>  <td>18603</td>  <td>28260</td> </tr>\r
+ <tr>  <td>Malta</td>  <td>312</td>  <td>409</td>  <td>417</td>  <td>426</td>  <td>413</td> </tr>\r
+ <tr>  <td>Marshall Islands</td>  <td>13</td>  <td>62</td>  <td>70</td>  <td>79</td>  <td>92</td> </tr>\r
+ <tr>  <td>Martinique</td>  <td>222</td>  <td>405</td>  <td>411</td>  <td>418</td>  <td>393</td> </tr>\r
+ <tr>  <td>Mauritania</td>  <td>651</td>  <td>3291</td>  <td>3732</td>  <td>4443</td>  <td>6061</td> </tr>\r
+ <tr>  <td>Mauritius</td>  <td>493</td>  <td>1288</td>  <td>1337</td>  <td>1400</td>  <td>1426</td> </tr>\r
+ <tr>  <td>Mayotte</td>  <td>15</td>  <td>194</td>  <td>224</td>  <td>277</td>  <td>386</td> </tr>\r
+ <tr>  <td>Mexico</td>  <td>27741</td>  <td>109610</td>  <td>115528</td>  <td>123366</td>  <td>128964</td> </tr>\r
+ <tr>  <td>Micronesia (Fed. States of)</td>  <td>32</td>  <td>111</td>  <td>114</td>  <td>122</td>  <td>128</td> </tr>\r
+ <tr>  <td>Moldova (Republic of)</td>  <td>2341</td>  <td>3604</td>  <td>3462</td>  <td>3291</td>  <td>2734</td> </tr>\r
+ <tr>  <td>Monaco</td>  <td>20</td>  <td>33</td>  <td>33</td>  <td>35</td>  <td>38</td> </tr>\r
+ <tr>  <td>Mongolia</td>  <td>761</td>  <td>2671</td>  <td>2855</td>  <td>3134</td>  <td>3446</td> </tr>\r
+ <tr>  <td>Montenegro</td>  <td>399</td>  <td>624</td>  <td>627</td>  <td>633</td>  <td>618</td> </tr>\r
+ <tr>  <td>Montserrat</td>  <td>14</td>  <td>6</td>  <td>6</td>  <td>7</td>  <td>7</td> </tr>\r
+ <tr>  <td>Morocco</td>  <td>8953</td>  <td>31993</td>  <td>34330</td>  <td>37865</td>  <td>42583</td> </tr>\r
+ <tr>  <td>Mozambique</td>  <td>6442</td>  <td>22894</td>  <td>25957</td>  <td>31190</td>  <td>44148</td> </tr>\r
+ <tr>  <td>Myanmar</td>  <td>17158</td>  <td>50020</td>  <td>53087</td>  <td>57585</td>  <td>63373</td> </tr>\r
+ <tr>  <td>Namibia</td>  <td>485</td>  <td>2171</td>  <td>2412</td>  <td>2810</td>  <td>3588</td> </tr>\r
+ <tr>  <td>Nauru</td>  <td>3</td>  <td>10</td>  <td>11</td>  <td>11</td>  <td>11</td> </tr>\r
+ <tr>  <td>Nepal</td>  <td>8126</td>  <td>29331</td>  <td>32503</td>  <td>38031</td>  <td>49028</td> </tr>\r
+ <tr>  <td>Netherlands</td>  <td>10114</td>  <td>16592</td>  <td>16915</td>  <td>17348</td>  <td>17399</td> </tr>\r
+ <tr>  <td>Netherlands Antilles</td>  <td>112</td>  <td>198</td>  <td>207</td>  <td>210</td>  <td>192</td> </tr>\r
+ <tr>  <td>New Caledonia</td>  <td>65</td>  <td>250</td>  <td>271</td>  <td>304</td>  <td>362</td> </tr>\r
+ <tr>  <td>New Zealand</td>  <td>1908</td>  <td>4266</td>  <td>4492</td>  <td>4831</td>  <td>5349</td> </tr>\r
+ <tr>  <td>Nicaragua</td>  <td>1295</td>  <td>5743</td>  <td>6265</td>  <td>7058</td>  <td>8143</td> </tr>\r
+ <tr>  <td>Niger</td>  <td>2462</td>  <td>15290</td>  <td>19150</td>  <td>27388</td>  <td>58216</td> </tr>\r
+ <tr>  <td>Nigeria</td>  <td>36680</td>  <td>154729</td>  <td>175928</td>  <td>210057</td>  <td>289083</td> </tr>\r
+ <tr>  <td>Niue</td>  <td>5</td>  <td>1</td>  <td>1</td>  <td>1</td>  <td>1</td> </tr>\r
+ <tr>  <td>Northern Mariana Islands</td>  <td>7</td>  <td>87</td>  <td>96</td>  <td>111</td>  <td>151</td> </tr>\r
+ <tr>  <td>Norway</td>  <td>3265</td>  <td>4812</td>  <td>5036</td>  <td>5365</td>  <td>5947</td> </tr>\r
+ <tr>  <td>Occupied Palestinian Territory</td>  <td>1005</td>  <td>4277</td>  <td>5090</td>  <td>6553</td>  <td>10265</td> </tr>\r
+ <tr>  <td>Oman</td>  <td>456</td>  <td>2845</td>  <td>3198</td>  <td>3782</td>  <td>4878</td> </tr>\r
+ <tr>  <td>Pakistan</td>  <td>41177</td>  <td>180808</td>  <td>205504</td>  <td>246286</td>  <td>335195</td> </tr>\r
+ <tr>  <td>Palau</td>  <td>7</td>  <td>20</td>  <td>21</td>  <td>23</td>  <td>26</td> </tr>\r
+ <tr>  <td>Panama</td>  <td>860</td>  <td>3454</td>  <td>3773</td>  <td>4267</td>  <td>5092</td> </tr>\r
+ <tr>  <td>Papua New Guinea</td>  <td>1798</td>  <td>6732</td>  <td>7678</td>  <td>9265</td>  <td>12871</td> </tr>\r
+ <tr>  <td>Paraguay</td>  <td>1473</td>  <td>6349</td>  <td>7007</td>  <td>8026</td>  <td>9867</td> </tr>\r
+ <tr>  <td>Peru</td>  <td>7632</td>  <td>29165</td>  <td>31197</td>  <td>34528</td>  <td>39776</td> </tr>\r
+ <tr>  <td>Philippines</td>  <td>19996</td>  <td>91983</td>  <td>101734</td>  <td>117270</td>  <td>146156</td> </tr>\r
+ <tr>  <td>Pitcairn</td>  <td>0</td>  <td>0</td>  <td>0</td>  <td>0</td>  <td>0</td> </tr>\r
+ <tr>  <td>Poland</td>  <td>24824</td>  <td>38074</td>  <td>37788</td>  <td>36964</td>  <td>32013</td> </tr>\r
+ <tr>  <td>Portugal</td>  <td>8405</td>  <td>10707</td>  <td>10787</td>  <td>10706</td>  <td>10015</td> </tr>\r
+ <tr>  <td>Puerto Rico</td>  <td>2218</td>  <td>3982</td>  <td>4074</td>  <td>4176</td>  <td>4103</td> </tr>\r
+ <tr>  <td>Qatar</td>  <td>25</td>  <td>1409</td>  <td>1630</td>  <td>1848</td>  <td>2316</td> </tr>\r
+ <tr>  <td>Republic of Korea</td>  <td>19211</td>  <td>48333</td>  <td>49153</td>  <td>49484</td>  <td>44077</td> </tr>\r
+ <tr>  <td>Réunion</td>  <td>248</td>  <td>827</td>  <td>886</td>  <td>973</td>  <td>1096</td> </tr>\r
+ <tr>  <td>Romania</td>  <td>16311</td>  <td>21275</td>  <td>20787</td>  <td>19961</td>  <td>17279</td> </tr>\r
+ <tr>  <td>Russian Federation</td>  <td>102702</td>  <td>140874</td>  <td>137983</td>  <td>132345</td>  <td>116097</td> </tr>\r
+ <tr>  <td>Rwanda</td>  <td>2162</td>  <td>9998</td>  <td>11743</td>  <td>14676</td>  <td>22082</td> </tr>\r
+ <tr>  <td>Saint Helena</td>  <td>5</td>  <td>4</td>  <td>4</td>  <td>5</td>  <td>5</td> </tr>\r
+ <tr>  <td>Saint Kitts and Nevis</td>  <td>46</td>  <td>52</td>  <td>56</td>  <td>61</td>  <td>69</td> </tr>\r
+ <tr>  <td>Saint Lucia</td>  <td>83</td>  <td>172</td>  <td>182</td>  <td>198</td>  <td>217</td> </tr>\r
+ <tr>  <td>Saint Pierre and Miquelon</td>  <td>5</td>  <td>6</td>  <td>6</td>  <td>6</td>  <td>6</td> </tr>\r
+ <tr>  <td>St. Vincent and the Grenadines</td>  <td>67</td>  <td>109</td>  <td>110</td>  <td>111</td>  <td>119</td> </tr>\r
+ <tr>  <td>Samoa</td>  <td>82</td>  <td>179</td>  <td>181</td>  <td>188</td>  <td>192</td> </tr>\r
+ <tr>  <td>San Marino</td>  <td>13</td>  <td>31</td>  <td>32</td>  <td>33</td>  <td>33</td> </tr>\r
+ <tr>  <td>Sao Tome and Principe</td>  <td>60</td>  <td>163</td>  <td>180</td>  <td>216</td>  <td>296</td> </tr>\r
+ <tr>  <td>Saudi Arabia</td>  <td>3201</td>  <td>25721</td>  <td>28933</td>  <td>34176</td>  <td>43658</td> </tr>\r
+ <tr>  <td>Senegal</td>  <td>2416</td>  <td>12534</td>  <td>14526</td>  <td>17861</td>  <td>26102</td> </tr>\r
+ <tr>  <td>Serbia</td>  <td>6732</td>  <td>9850</td>  <td>9828</td>  <td>9720</td>  <td>9193</td> </tr>\r
+ <tr>  <td>Seychelles</td>  <td>36</td>  <td>84</td>  <td>86</td>  <td>91</td>  <td>97</td> </tr>\r
+ <tr>  <td>Sierra Leone</td>  <td>1944</td>  <td>5696</td>  <td>6557</td>  <td>8112</td>  <td>12446</td> </tr>\r
+ <tr>  <td>Singapore</td>  <td>1022</td>  <td>4737</td>  <td>5059</td>  <td>5362</td>  <td>5221</td> </tr>\r
+ <tr>  <td>Slovakia</td>  <td>3463</td>  <td>5406</td>  <td>5437</td>  <td>5413</td>  <td>4917</td> </tr>\r
+ <tr>  <td>Slovenia</td>  <td>1473</td>  <td>2020</td>  <td>2044</td>  <td>2050</td>  <td>1954</td> </tr>\r
+ <tr>  <td>Solomon Islands</td>  <td>90</td>  <td>523</td>  <td>599</td>  <td>725</td>  <td>1007</td> </tr>\r
+ <tr>  <td>Somalia</td>  <td>2264</td>  <td>9133</td>  <td>10731</td>  <td>13922</td>  <td>23522</td> </tr>\r
+ <tr>  <td>South Africa</td>  <td>13683</td>  <td>50110</td>  <td>51684</td>  <td>53766</td>  <td>56802</td> </tr>\r
+ <tr>  <td>Spain</td>  <td>28009</td>  <td>44904</td>  <td>47203</td>  <td>49265</td>  <td>51260</td> </tr>\r
+ <tr>  <td>Sri Lanka</td>  <td>8241</td>  <td>20238</td>  <td>21167</td>  <td>22033</td>  <td>21705</td> </tr>\r
+ <tr>  <td>Sudan</td>  <td>9190</td>  <td>42272</td>  <td>47730</td>  <td>56688</td>  <td>75884</td> </tr>\r
+ <tr>  <td>Suriname</td>  <td>215</td>  <td>520</td>  <td>547</td>  <td>586</td>  <td>619</td> </tr>\r
+ <tr>  <td>Swaziland</td>  <td>273</td>  <td>1185</td>  <td>1287</td>  <td>1455</td>  <td>1749</td> </tr>\r
+ <tr>  <td>Sweden</td>  <td>7014</td>  <td>9249</td>  <td>9498</td>  <td>9915</td>  <td>10571</td> </tr>\r
+ <tr>  <td>Switzerland</td>  <td>4693</td>  <td>7568</td>  <td>7736</td>  <td>8020</td>  <td>8514</td> </tr>\r
+ <tr>  <td>Syrian Arab Republic</td>  <td>3536</td>  <td>21906</td>  <td>24494</td>  <td>28592</td>  <td>36911</td> </tr>\r
+ <tr>  <td>Tajikistan</td>  <td>1532</td>  <td>6952</td>  <td>7761</td>  <td>9075</td>  <td>11111</td> </tr>\r
+ <tr>  <td>TFYR Macedonia</td>  <td>1230</td>  <td>2042</td>  <td>2045</td>  <td>2037</td>  <td>1857</td> </tr>\r
+ <tr>  <td>Thailand</td>  <td>20607</td>  <td>67764</td>  <td>69939</td>  <td>72628</td>  <td>73361</td> </tr>\r
+ <tr>  <td>Timor-Leste</td>  <td>433</td>  <td>1134</td>  <td>1385</td>  <td>1869</td>  <td>3217</td> </tr>\r
+ <tr>  <td>Togo</td>  <td>1329</td>  <td>6619</td>  <td>7607</td>  <td>9282</td>  <td>13196</td> </tr>\r
+ <tr>  <td>Tokelau</td>  <td>2</td>  <td>1</td>  <td>1</td>  <td>1</td>  <td>1</td> </tr>\r
+ <tr>  <td>Tonga</td>  <td>47</td>  <td>104</td>  <td>105</td>  <td>112</td>  <td>123</td> </tr>\r
+ <tr>  <td>Trinidad and Tobago</td>  <td>636</td>  <td>1339</td>  <td>1368</td>  <td>1388</td>  <td>1278</td> </tr>\r
+ <tr>  <td>Tunisia</td>  <td>3530</td>  <td>10272</td>  <td>10884</td>  <td>11797</td>  <td>12711</td> </tr>\r
+ <tr>  <td>Turkey</td>  <td>21484</td>  <td>74816</td>  <td>79966</td>  <td>87364</td>  <td>97389</td> </tr>\r
+ <tr>  <td>Turkmenistan</td>  <td>1211</td>  <td>5110</td>  <td>5509</td>  <td>6072</td>  <td>6796</td> </tr>\r
+ <tr>  <td>Turks and Caicos Islands</td>  <td>5</td>  <td>33</td>  <td>35</td>  <td>38</td>  <td>40</td> </tr>\r
+ <tr>  <td>Tuvalu</td>  <td>5</td>  <td>10</td>  <td>10</td>  <td>11</td>  <td>11</td> </tr>\r
+ <tr>  <td>Uganda</td>  <td>5158</td>  <td>32710</td>  <td>39710</td>  <td>53406</td>  <td>91271</td> </tr>\r
+ <tr>  <td>Ukraine</td>  <td>37298</td>  <td>45708</td>  <td>44165</td>  <td>41617</td>  <td>35026</td> </tr>\r
+ <tr>  <td>United Arab Emirates</td>  <td>70</td>  <td>4599</td>  <td>5193</td>  <td>6109</td>  <td>8253</td> </tr>\r
+ <tr>  <td>United Kingdom</td>  <td>50616</td>  <td>61565</td>  <td>63528</td>  <td>66601</td>  <td>72365</td> </tr>\r
+ <tr>  <td>United Republic of Tanzania</td>  <td>7650</td>  <td>43739</td>  <td>52109</td>  <td>67394</td>  <td>109450</td> </tr>\r
+ <tr>  <td>United States of America</td>  <td>157813</td>  <td>314659</td>  <td>332334</td>  <td>358735</td>  <td>403932</td> </tr>\r
+ <tr>  <td>United States Virgin Islands</td>  <td>27</td>  <td>110</td>  <td>108</td>  <td>103</td>  <td>75</td> </tr>\r
+ <tr>  <td>Uruguay</td>  <td>2239</td>  <td>3361</td>  <td>3430</td>  <td>3546</td>  <td>3637</td> </tr>\r
+ <tr>  <td>Uzbekistan</td>  <td>6314</td>  <td>27488</td>  <td>29456</td>  <td>32715</td>  <td>36439</td> </tr>\r
+ <tr>  <td>Vanuatu</td>  <td>48</td>  <td>240</td>  <td>276</td>  <td>338</td>  <td>482</td> </tr>\r
+ <tr>  <td>Venezuela (Bolivarian Republic of)</td>  <td>5094</td>  <td>28583</td>  <td>31292</td>  <td>35370</td>  <td>42042</td> </tr>\r
+ <tr>  <td>Viet Nam</td>  <td>27367</td>  <td>88069</td>  <td>93647</td>  <td>102054</td>  <td>111666</td> </tr>\r
+ <tr>  <td>Wallis and Futuna Islands</td>  <td>7</td>  <td>15</td>  <td>16</td>  <td>17</td>  <td>17</td> </tr>\r
+ <tr>  <td>Western Sahara</td>  <td>14</td>  <td>513</td>  <td>625</td>  <td>775</td>  <td>938</td> </tr>\r
+ <tr>  <td>Yemen</td>  <td>4316</td>  <td>23580</td>  <td>27819</td>  <td>35509</td>  <td>53689</td> </tr>\r
+ <tr>  <td>Zambia</td>  <td>2340</td>  <td>12935</td>  <td>14980</td>  <td>18890</td>  <td>28957</td> </tr>\r
+ <tr>  <td>Zimbabwe</td>  <td>2747</td>  <td>12523</td>  <td>14029</td>  <td>16780</td>  <td>22178</td> </tr>\r
  </tbody>\r
  </table>\r
  \r
diff --git a/examples/dotnet/ex2editfilter.aspx b/examples/dotnet/ex2editfilter.aspx

index 502d0ab..08097e1 100644 (file)
--- a/examples/dotnet/ex2editfilter.aspx
+++ b/examples/dotnet/ex2editfilter.aspx
@@ -14,15 +14,6 @@ Sub Page_Load(Sender As object, e As EventArgs)
    app.OpenGridForm(ex8)\r
  End Sub\r
  \r
-Protected Overrides Sub Render(writer as HTMLTextWriter)\r
-  select case ex8.action\r
-    case "table": MyBase.Render(writer)\r
-    case "ins":   ex8.InsertRecord(writer)\r
-    case "upd":   ex8.UpdateRecord(writer)\r
-    case "del":   ex8.DeleteRecord(writer)\r
-  end select\r
-End Sub\r
-\r
  </script>\r
  \r
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">\r
diff --git a/examples/dotnet/ex2json.aspx b/examples/dotnet/ex2json.aspx

index d18bc25..7845f92 100644 (file)
--- a/examples/dotnet/ex2json.aspx
+++ b/examples/dotnet/ex2json.aspx
@@ -1,9 +1,18 @@
-<%@ Page Language="VB" ResponseEncoding="iso-8859-1" Debug="true" %>\r
+<%@ Page Language="VB" ResponseEncoding="iso-8859-1" %>\r
  <%@ Register TagPrefix="Rico" Assembly="Rico" NameSpace="Rico" %>\r
  <%@ Register TagPrefix="My" TagName="dbLib" Src="dbConnect.ascx" %>\r
  <My:dbLib id='app' runat='server' />\r
  \r
  \r
+<script runat="server">\r
+\r
+Sub Page_Load(Sender As object, e As EventArgs)\r
+  Session.Timeout=60\r
+  app.OpenGrid(ex2j)\r
+End Sub\r
+\r
+</script>\r
+\r
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">\r
  <html>\r
  <head>\r
@@ -31,7 +40,7 @@ Notice how the number of visible rows is set automatically based
  on the size of the window. Try the different grid styles that\r
  are available. \r
  Click on a cell to see available actions.\r
-<a href='ricoQuery.aspx?id=ex2j&offset=0&page_size=10&_fmt=json'>View the AJAX response (JSON)</a>\r
+<a href='<%=Page.Request.ServerVariables("SCRIPT_NAME")%>?_action_ex2j=query&offset=0&page_size=10'>View the AJAX response (JSON)</a>\r
  (displays directly in Chrome and Safari, requires JSONview or similar extension in Firefox).\r
  </div>\r
  \r
diff --git a/examples/dotnet/ex2nosession.aspx b/examples/dotnet/ex2nosession.aspx

index 702eb1c..c24d389 100644 (file)
--- a/examples/dotnet/ex2nosession.aspx
+++ b/examples/dotnet/ex2nosession.aspx
@@ -1,9 +1,8 @@
-<%@ Page Language="VB" ResponseEncoding="iso-8859-1" Debug="true" validateRequest="false" %>\r
+<%@ Page Language="VB" ResponseEncoding="iso-8859-1" validateRequest="false" %>\r
  <%@ Register TagPrefix="Rico" Assembly="Rico" NameSpace="Rico" %>\r
  <%@ Register TagPrefix="My" TagName="dbLib" Src="dbConnect.ascx" %>\r
  <My:dbLib id='app' runat='server' />\r
  \r
-\r
  <script runat="server">\r
  \r
  Sub Page_Load(Sender As object, e As EventArgs)\r
@@ -11,26 +10,9 @@ Sub Page_Load(Sender As object, e As EventArgs)
    dim arEmpSql as string() = {"LastName","', '","FirstName"}\r
    dim oSqlCompat=new sqlCompatibilty(app.dbDialect)\r
    EmployeeID.SelectSql="select EmployeeID," & oSqlCompat.Concat(arEmpSql,false) & " from employees order by LastName,FirstName" \r
-  ex8n.dataProvider=Request.ServerVariables("SCRIPT_NAME")\r
    app.OpenGridForm(ex8n)\r
  End Sub\r
  \r
-Protected Overrides Sub Render(writer as HTMLTextWriter)\r
-  RespObj.dbConnection=app.dbConnection\r
-  select case ex8n.action\r
-    case "table": \r
-      RespObj.RenderFlag=false\r
-      MyBase.Render(writer)\r
-    case "ins":   ex8n.InsertRecord(writer)\r
-    case "upd":   ex8n.UpdateRecord(writer)\r
-    case "del":   ex8n.DeleteRecord(writer)\r
-    case "query":\r
-      RespObj.dbDialect=app.dbDialect\r
-      RespObj.oParse=ex8n.ParseClone()\r
-      RespObj.RunQuery(writer)\r
-  end select\r
-End Sub\r
-\r
  </script>\r
  \r
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">\r
@@ -65,7 +47,7 @@ data requests itself. No session variables are used.
  <Rico:LiveGridEdit runat='server' id='ex8n' TableName='orders' DefaultSort='OrderID' FilterLocation='-1' sessions='false'>\r
    <Rico:CalendarControl runat='server' id='Cal' icon='rico-icon rico-calarrow' />\r
    <Rico:TreeControl runat='server' id='CustomerTree' icon='rico-icon rico-dotbutton' source='CustTree.aspx' />\r
-  <Rico:Panel runat='server' heading='Basic Info' />\r
+  <Rico:ColumnGroup runat='server' heading='Basic Info' />\r
    <Rico:Column runat='server' heading='Order#'        width='60'  ColName='OrderID'      EntryType='B' ColData='<auto>' ConfirmDeleteColumn='true' />\r
    <Rico:Column runat='server' heading='Customer'      width='160' ColName='CustomerID'   EntryType='CL' InsertOnly='true' SelectCtl='CustomerTree' SelectSql="select CustomerID,CompanyName from customers order by CompanyName" filterUI='t' />\r
    <Rico:Column runat='server' heading='Sales Person'  width='140' ColName='EmployeeID'   EntryType='SL' filterUI='s' id='EmployeeID' />\r
@@ -73,7 +55,7 @@ data requests itself. No session variables are used.
    <Rico:Column runat='server' heading='Required Date' width='100' ColName='RequiredDate' EntryType='D' ColData='Today' SelectCtl='Cal' />\r
    <Rico:Column runat='server' heading='Net Sale'      width='80'  format='DOLLAR'        Formula='select sum(UnitPrice*Quantity*(1.0-Discount)) from order_details d where d.OrderID=t.OrderID' />\r
  \r
-  <Rico:Panel runat='server' heading='Ship To' />\r
+  <Rico:ColumnGroup runat='server' heading='Ship To' />\r
    <Rico:Column runat='server' heading='Name'        width='150' ColName='ShipName'       EntryType='B' />\r
    <Rico:Column runat='server' heading='Address'     width='150' ColName='ShipAddress'    EntryType='B' />\r
    <Rico:Column runat='server' heading='City'        width='80'  ColName='ShipCity'       EntryType='B' filterUI='s' />\r
@@ -82,7 +64,5 @@ data requests itself. No session variables are used.
    <Rico:Column runat='server' heading='Country'     width='90'  ColName='ShipCountry'    EntryType='N' filterUI='s' control="new Rico.TableColumn.link('http://en.wikipedia.org/wiki/{11}','_blank')" />\r
  </Rico:LiveGridEdit>\r
  \r
-<Rico:Response id="RespObj" runat="server" />\r
-\r
  </body>\r
  </html>\r
diff --git a/examples/dotnet/ex2xml.aspx b/examples/dotnet/ex2xml.aspx

index 0360a3a..7a18e33 100644 (file)
--- a/examples/dotnet/ex2xml.aspx
+++ b/examples/dotnet/ex2xml.aspx
@@ -1,8 +1,17 @@
-<%@ Page Language="VB" ResponseEncoding="iso-8859-1" Debug="true" %>\r
+<%@ Page Language="VB" ResponseEncoding="iso-8859-1" %>\r
  <%@ Register TagPrefix="Rico" Assembly="Rico" NameSpace="Rico" %>\r
  <%@ Register TagPrefix="My" TagName="dbLib" Src="dbConnect.ascx" %>\r
  <My:dbLib id='app' runat='server' />\r
  \r
+<script runat="server">\r
+\r
+Sub Page_Load(Sender As object, e As EventArgs)\r
+  Session.Timeout=60\r
+  app.OpenGrid(ex2x)\r
+End Sub\r
+\r
+</script>\r
+\r
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">\r
  <html>\r
  <head>\r
@@ -30,7 +39,7 @@ Notice how the number of visible rows is set automatically based
  on the size of the window. Try the different grid styles that\r
  are available. \r
  Click on a cell to see available actions.\r
-<a href='ricoQuery.aspx?id=ex2x&offset=0&page_size=10&get_total=true'>View the AJAX response (XML)</a>.\r
+<a href='<%=Page.Request.ServerVariables("SCRIPT_NAME")%>?_action_ex2x=query&offset=0&page_size=10'>View the AJAX response (XML)</a>.\r
  </div>\r
  \r
  <Rico:LiveGrid runat='server' id='ex2x' TableName='orders' DefaultSort='OrderID' menuEvent='click' frozenColumns='1' highlightElem='cursorRow'>\r
diff --git a/examples/dotnet/menu.aspx b/examples/dotnet/menu.aspx

index e505bd3..dc9c451 100644 (file)
--- a/examples/dotnet/menu.aspx
+++ b/examples/dotnet/menu.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="VB" ResponseEncoding="iso-8859-1" Debug="true" validateRequest="false" %>\r
+<%@ Page Language="VB" ResponseEncoding="iso-8859-1" %>\r
  <%@ Register TagPrefix="Rico" Assembly="Rico" NameSpace="Rico" %>\r
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">\r
  <html>\r
@@ -52,6 +52,7 @@ ul li {
  <li><a id="demo_ex1.aspx">LiveGrid sourced from HTML table</a>\r
  <li><a id="demo_ex2xml.aspx">LiveGrid sourced from SQL database (xml)</a>\r
  <li><a id="demo_ex2json.aspx">LiveGrid sourced from SQL database (json)</a>\r
+<li><a id="demo_3grids.aspx">3 grids with drill-down</a>\r
  <li><a id="demo_ShipperEdit.aspx">Editable LiveGrid (Shippers)</a>\r
  <li><a id="demo_employees.aspx">Editable LiveGrid (Employees)</a>\r
  <li><a id="demo_ex2editfilter.aspx">Editable LiveGrid (Orders)</a>\r
@@ -181,7 +182,6 @@ ul li {
  <li><a id='lib_dojo/1.5/dojo/dojo.xd.js'>dojo 1.5</a>\r
  <li><a id='lib_ext-core/3.0/ext-core.js'>Ext 3.0</a>\r
  <li><a id='lib_ext-core/3.1/ext-core.js'>Ext 3.1</a>\r
-<li><a id='lib_glow.core-1.7'>Glow 1.7</a>\r
  </ul>\r
    </div>\r
  </div>\r
diff --git a/examples/dotnet/photos.aspx b/examples/dotnet/photos.aspx

index 7fc73b3..422bb20 100644 (file)
--- a/examples/dotnet/photos.aspx
+++ b/examples/dotnet/photos.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="VB" ResponseEncoding="iso-8859-1" Debug="true" %>\r
+<%@ Page Language="VB" ResponseEncoding="iso-8859-1" %>\r
  <%@ Register TagPrefix="Rico" Assembly="Rico" NameSpace="Rico" %>\r
  \r
  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">\r
@@ -66,7 +66,7 @@ function UpdateGrid() {
  <body>\r
  \r
  <div id='explanation'><form onsubmit='UpdateGrid(); return false;'>\r
-<p>Get <a href="http://www.flickr.com">Flickr</a> photos tagged with these keywords (separate words with commas):\r
+<p>Find 100 <a href="http://www.flickr.com">Flickr</a> photos tagged with the keywords you type below (separate words with commas):\r
  <p><input type='text' id='tags'>\r
  <input type='submit' value='Get Photos'>\r
  <p>Then try moving your cursor over each photo...\r
diff --git a/examples/dotnet/ricoQuery.aspx b/examples/dotnet/ricoQuery.aspx

deleted file mode 100644 (file)

index 96099b3..0000000
--- a/examples/dotnet/ricoQuery.aspx
+++ /dev/null
@@ -1,34 +0,0 @@
-<%@ Page Language="vb" Debug="true" validateRequest="false" %>\r
-<%@ Register TagPrefix="Rico" Assembly="Rico" NameSpace="Rico" %>\r
-<%@ Register TagPrefix="My" TagName="dbLib" Src="dbConnect.ascx" %>\r
-<My:dbLib id='app' runat='server' />\r
-\r
-<script runat="server">\r
-\r
-Sub Page_Load(Sender As object, e As EventArgs)\r
-  dim sql = session.contents(RespObj.RequestId)\r
-  if IsNothing(sql) then\r
-    RespObj.ErrorMsg="Your connection with the server was idle for too long and timed out. Please refresh this page and try again."\r
-  elseif not app.OpenDB() then\r
-    RespObj.ErrorMsg=app.LastErrorMsg\r
-  else\r
-    RespObj.filters=session.contents(RespObj.RequestId & ".filters")\r
-    if IsReference(sql) and TypeName(sql)<>"String" then\r
-      RespObj.oParse=sql.Clone()\r
-    elseif ucase(left(sql,7))="SELECT " then\r
-      RespObj.oParse=new sqlParse()\r
-      RespObj.oParse.ParseSelect(sql)\r
-    else\r
-      ' stored procedure\r
-      RespObj.sqlText=sql\r
-    end if\r
-    RespObj.dbConnection=app.dbConnection\r
-    RespObj.dbDialect=app.dbDialect\r
-    RespObj.sendDebugMsgs=true   ' true for development, false for production\r
-    RespObj.LogSqlOnError=true   ' true for development, false for production\r
-  end if\r
-End Sub\r
-\r
-</script>\r
-\r
-<Rico:Response id="RespObj" runat="server"/>\r
diff --git a/examples/dotnet/widgets.aspx b/examples/dotnet/widgets.aspx

index ebc7d63..5aa4266 100644 (file)
--- a/examples/dotnet/widgets.aspx
+++ b/examples/dotnet/widgets.aspx
@@ -31,10 +31,6 @@ Rico.onLoad( function() {
    cal.atLoad();\r
    cal.selectNow();\r
    cal.openPopup();\r
-  var links=Rico.select('#themeGallery a');\r
-  for (var i=0; i<links.length; i++) {\r
-    links[i].onclick=themeClick;\r
-  }\r
    dialog=new Rico.Window('',{height:'250px',width:'300px',overflow:'auto'}, 'dialog');\r
  });\r
  \r
@@ -61,14 +57,14 @@ div.ricoLG_cell {
  \r
  \r
  <body style="font-size:80%;">\r
-  \r
+\r
  <div id='explanation'>\r
-Base Library: \r
+Base Library:\r
  <script type='text/javascript'>\r
  document.write(Rico.Lib+' '+Rico.LibVersion);\r
  </script>\r
  <hr>\r
-This example displays some of the widgets that come with Rico. \r
+This example displays some of the widgets that come with Rico.\r
  The widgets are compatible with all base libraries and themes.\r
  </div>\r
  \r
@@ -81,1866 +77,246 @@ The widgets are compatible with all base libraries and themes.
  <p class="ricoBookmark"><span id="population_bookmark">&nbsp;</span></p>\r
  <table class="ricoLiveGrid" id="population">\r
  <thead>\r
- <tr>\r
-  <td class='ricoFrozen'></td>\r
-  <td colspan=5>Population (thousands)</td>\r
- </tr>\r
- <tr>\r
-  <td class='ricoFrozen'>Country or area</td>\r
-  <td>1950</td>\r
-  <td>2009</td>\r
-  <td>2015</td>\r
-  <td>2025</td>\r
-  <td>2050</td>\r
- </tr>\r
+ <tr>  <td class='ricoFrozen'></td>  <td colspan=5>Population (thousands)</td> </tr>\r
+ <tr>  <td class='ricoFrozen'>Country or area</td>  <td>1950</td>  <td>2009</td>  <td>2015</td>  <td>2025</td>  <td>2050</td> </tr>\r
  </thead>\r
  <tbody>\r
- <tr>\r
-  <td>Afghanistan</td>\r
-  <td>8151</td>\r
-  <td>28150</td>\r
-  <td>34246</td>\r
-  <td>44970</td>\r
-  <td>73938</td>\r
- </tr>\r
- <tr>\r
-  <td>Albania</td>\r
-  <td>1215</td>\r
-  <td>3155</td>\r
-  <td>3256</td>\r
-  <td>3395</td>\r
-  <td>3303</td>\r
- </tr>\r
- <tr>\r
-  <td>Algeria</td>\r
-  <td>8753</td>\r
-  <td>34895</td>\r
-  <td>38088</td>\r
-  <td>42882</td>\r
-  <td>49610</td>\r
- </tr>\r
- <tr>\r
-  <td>American Samoa</td>\r
-  <td>19</td>\r
-  <td>67</td>\r
-  <td>74</td>\r
-  <td>86</td>\r
-  <td>107</td>\r
- </tr>\r
- <tr>\r
-  <td>Andorra</td>\r
-  <td>6</td>\r
-  <td>86</td>\r
-  <td>93</td>\r
-  <td>107</td>\r
-  <td>137</td>\r
- </tr>\r
- <tr>\r
-  <td>Angola</td>\r
-  <td>4148</td>\r
-  <td>18498</td>\r
-  <td>21690</td>\r
-  <td>27441</td>\r
-  <td>42267</td>\r
- </tr>\r
- <tr>\r
-  <td>Anguilla</td>\r
-  <td>5</td>\r
-  <td>15</td>\r
-  <td>17</td>\r
-  <td>18</td>\r
-  <td>20</td>\r
- </tr>\r
- <tr>\r
-  <td>Antigua and Barbuda</td>\r
-  <td>46</td>\r
-  <td>88</td>\r
-  <td>93</td>\r
-  <td>101</td>\r
-  <td>112</td>\r
- </tr>\r
- <tr>\r
-  <td>Argentina</td>\r
-  <td>17150</td>\r
-  <td>40276</td>\r
-  <td>42548</td>\r
-  <td>45883</td>\r
-  <td>50943</td>\r
- </tr>\r
- <tr>\r
-  <td>Armenia</td>\r
-  <td>1354</td>\r
-  <td>3083</td>\r
-  <td>3139</td>\r
-  <td>3181</td>\r
-  <td>3018</td>\r
- </tr>\r
- <tr>\r
-  <td>Aruba</td>\r
-  <td>38</td>\r
-  <td>107</td>\r
-  <td>109</td>\r
-  <td>112</td>\r
-  <td>106</td>\r
- </tr>\r
- <tr>\r
-  <td>Australia</td>\r
-  <td>8219</td>\r
-  <td>21293</td>\r
-  <td>22607</td>\r
-  <td>24703</td>\r
-  <td>28724</td>\r
- </tr>\r
- <tr>\r
-  <td>Austria</td>\r
-  <td>6936</td>\r
-  <td>8364</td>\r
-  <td>8467</td>\r
-  <td>8600</td>\r
-  <td>8515</td>\r
- </tr>\r
- <tr>\r
-  <td>Azerbaijan</td>\r
-  <td>2896</td>\r
-  <td>8832</td>\r
-  <td>9426</td>\r
-  <td>10128</td>\r
-  <td>10579</td>\r
- </tr>\r
- <tr>\r
-  <td>Bahamas</td>\r
-  <td>79</td>\r
-  <td>342</td>\r
-  <td>366</td>\r
-  <td>402</td>\r
-  <td>455</td>\r
- </tr>\r
- <tr>\r
-  <td>Bahrain</td>\r
-  <td>116</td>\r
-  <td>791</td>\r
-  <td>882</td>\r
-  <td>1021</td>\r
-  <td>1277</td>\r
- </tr>\r
- <tr>\r
-  <td>Bangladesh</td>\r
-  <td>43595</td>\r
-  <td>162221</td>\r
-  <td>175217</td>\r
-  <td>195012</td>\r
-  <td>222495</td>\r
- </tr>\r
- <tr>\r
-  <td>Barbados</td>\r
-  <td>211</td>\r
-  <td>256</td>\r
-  <td>260</td>\r
-  <td>262</td>\r
-  <td>237</td>\r
- </tr>\r
- <tr>\r
-  <td>Belarus</td>\r
-  <td>7745</td>\r
-  <td>9634</td>\r
-  <td>9355</td>\r
-  <td>8851</td>\r
-  <td>7275</td>\r
- </tr>\r
- <tr>\r
-  <td>Belgium</td>\r
-  <td>8628</td>\r
-  <td>10647</td>\r
-  <td>10878</td>\r
-  <td>11191</td>\r
-  <td>11493</td>\r
- </tr>\r
- <tr>\r
-  <td>Belize</td>\r
-  <td>69</td>\r
-  <td>307</td>\r
-  <td>344</td>\r
-  <td>404</td>\r
-  <td>506</td>\r
- </tr>\r
- <tr>\r
-  <td>Benin</td>\r
-  <td>2050</td>\r
-  <td>8935</td>\r
-  <td>10647</td>\r
-  <td>13767</td>\r
-  <td>21982</td>\r
- </tr>\r
- <tr>\r
-  <td>Bermuda</td>\r
-  <td>37</td>\r
-  <td>65</td>\r
-  <td>65</td>\r
-  <td>66</td>\r
-  <td>63</td>\r
- </tr>\r
- <tr>\r
-  <td>Bhutan</td>\r
-  <td>168</td>\r
-  <td>697</td>\r
-  <td>770</td>\r
-  <td>865</td>\r
-  <td>1013</td>\r
- </tr>\r
- <tr>\r
-  <td>Bolivia</td>\r
-  <td>2714</td>\r
-  <td>9863</td>\r
-  <td>10854</td>\r
-  <td>12368</td>\r
-  <td>14908</td>\r
- </tr>\r
- <tr>\r
-  <td>Bosnia and Herzegovina</td>\r
-  <td>2661</td>\r
-  <td>3767</td>\r
-  <td>3727</td>\r
-  <td>3608</td>\r
-  <td>3008</td>\r
- </tr>\r
- <tr>\r
-  <td>Botswana</td>\r
-  <td>413</td>\r
-  <td>1950</td>\r
-  <td>2106</td>\r
-  <td>2337</td>\r
-  <td>2758</td>\r
- </tr>\r
- <tr>\r
-  <td>Brazil</td>\r
-  <td>53975</td>\r
-  <td>193734</td>\r
-  <td>202866</td>\r
-  <td>213802</td>\r
-  <td>218512</td>\r
- </tr>\r
- <tr>\r
-  <td>British Virgin Islands</td>\r
-  <td>7</td>\r
-  <td>23</td>\r
-  <td>24</td>\r
-  <td>26</td>\r
-  <td>28</td>\r
- </tr>\r
- <tr>\r
-  <td>Brunei Darussalam</td>\r
-  <td>48</td>\r
-  <td>400</td>\r
-  <td>443</td>\r
-  <td>513</td>\r
-  <td>658</td>\r
- </tr>\r
- <tr>\r
-  <td>Bulgaria</td>\r
-  <td>7251</td>\r
-  <td>7545</td>\r
-  <td>7263</td>\r
-  <td>6752</td>\r
-  <td>5392</td>\r
- </tr>\r
- <tr>\r
-  <td>Burkina Faso</td>\r
-  <td>4080</td>\r
-  <td>15757</td>\r
-  <td>19013</td>\r
-  <td>24837</td>\r
-  <td>40830</td>\r
- </tr>\r
- <tr>\r
-  <td>Burundi</td>\r
-  <td>2456</td>\r
-  <td>8303</td>\r
-  <td>9413</td>\r
-  <td>11161</td>\r
-  <td>14846</td>\r
- </tr>\r
- <tr>\r
-  <td>Cambodia</td>\r
-  <td>4346</td>\r
-  <td>14805</td>\r
-  <td>16357</td>\r
-  <td>18973</td>\r
-  <td>23795</td>\r
- </tr>\r
- <tr>\r
-  <td>Cameroon</td>\r
-  <td>4466</td>\r
-  <td>19522</td>\r
-  <td>22169</td>\r
-  <td>26478</td>\r
-  <td>36736</td>\r
- </tr>\r
- <tr>\r
-  <td>Canada</td>\r
-  <td>13737</td>\r
-  <td>33573</td>\r
-  <td>35493</td>\r
-  <td>38659</td>\r
-  <td>44414</td>\r
- </tr>\r
- <tr>\r
-  <td>Cape Verde</td>\r
-  <td>146</td>\r
-  <td>506</td>\r
-  <td>548</td>\r
-  <td>616</td>\r
-  <td>703</td>\r
- </tr>\r
- <tr>\r
-  <td>Cayman Islands</td>\r
-  <td>7</td>\r
-  <td>56</td>\r
-  <td>59</td>\r
-  <td>63</td>\r
-  <td>66</td>\r
- </tr>\r
- <tr>\r
-  <td>Central African Republic</td>\r
-  <td>1327</td>\r
-  <td>4422</td>\r
-  <td>4927</td>\r
-  <td>5747</td>\r
-  <td>7603</td>\r
- </tr>\r
- <tr>\r
-  <td>Chad</td>\r
-  <td>2429</td>\r
-  <td>11206</td>\r
-  <td>13120</td>\r
-  <td>16906</td>\r
-  <td>27776</td>\r
- </tr>\r
- <tr>\r
-  <td>Channel Islands</td>\r
-  <td>102</td>\r
-  <td>150</td>\r
-  <td>151</td>\r
-  <td>152</td>\r
-  <td>144</td>\r
- </tr>\r
- <tr>\r
-  <td>Chile</td>\r
-  <td>6082</td>\r
-  <td>16970</td>\r
-  <td>17926</td>\r
-  <td>19266</td>\r
-  <td>20657</td>\r
- </tr>\r
- <tr>\r
-  <td>China</td>\r
-  <td>544951</td>\r
-  <td>1345751</td>\r
-  <td>1395998</td>\r
-  <td>1453140</td>\r
-  <td>1417045</td>\r
- </tr>\r
- <tr>\r
-  <td>China, Hong Kong SAR</td>\r
-  <td>1974</td>\r
-  <td>7022</td>\r
-  <td>7398</td>\r
-  <td>7969</td>\r
-  <td>8623</td>\r
- </tr>\r
- <tr>\r
-  <td>China, Macao SAR</td>\r
-  <td>190</td>\r
-  <td>538</td>\r
-  <td>568</td>\r
-  <td>603</td>\r
-  <td>593</td>\r
- </tr>\r
- <tr>\r
-  <td>Colombia</td>\r
-  <td>12000</td>\r
-  <td>45660</td>\r
-  <td>49385</td>\r
-  <td>54920</td>\r
-  <td>62877</td>\r
- </tr>\r
- <tr>\r
-  <td>Comoros</td>\r
-  <td>156</td>\r
-  <td>676</td>\r
-  <td>767</td>\r
-  <td>907</td>\r
-  <td>1226</td>\r
- </tr>\r
- <tr>\r
-  <td>Congo</td>\r
-  <td>808</td>\r
-  <td>3683</td>\r
-  <td>4225</td>\r
-  <td>5094</td>\r
-  <td>6863</td>\r
- </tr>\r
- <tr>\r
-  <td>Cook Islands</td>\r
-  <td>15</td>\r
-  <td>20</td>\r
-  <td>20</td>\r
-  <td>21</td>\r
-  <td>24</td>\r
- </tr>\r
- <tr>\r
-  <td>Costa Rica</td>\r
-  <td>966</td>\r
-  <td>4579</td>\r
-  <td>4957</td>\r
-  <td>5521</td>\r
-  <td>6373</td>\r
- </tr>\r
- <tr>\r
-  <td>Côte d'Ivoire</td>\r
-  <td>2505</td>\r
-  <td>21075</td>\r
-  <td>24210</td>\r
-  <td>29738</td>\r
-  <td>43373</td>\r
- </tr>\r
- <tr>\r
-  <td>Croatia</td>\r
-  <td>3850</td>\r
-  <td>4416</td>\r
-  <td>4370</td>\r
-  <td>4254</td>\r
-  <td>3825</td>\r
- </tr>\r
- <tr>\r
-  <td>Cuba</td>\r
-  <td>5920</td>\r
-  <td>11204</td>\r
-  <td>11213</td>\r
-  <td>11148</td>\r
-  <td>9725</td>\r
- </tr>\r
- <tr>\r
-  <td>Cyprus</td>\r
-  <td>494</td>\r
-  <td>871</td>\r
-  <td>925</td>\r
-  <td>1014</td>\r
-  <td>1175</td>\r
- </tr>\r
- <tr>\r
-  <td>Czech Republic</td>\r
-  <td>8925</td>\r
-  <td>10369</td>\r
-  <td>10510</td>\r
-  <td>10573</td>\r
-  <td>10294</td>\r
- </tr>\r
- <tr>\r
-  <td>Dem. People's Rep. of Korea</td>\r
-  <td>9737</td>\r
-  <td>23906</td>\r
-  <td>24399</td>\r
-  <td>25128</td>\r
-  <td>24562</td>\r
- </tr>\r
- <tr>\r
-  <td>Dem. Republic of the Congo</td>\r
-  <td>12184</td>\r
-  <td>66020</td>\r
-  <td>77419</td>\r
-  <td>98123</td>\r
-  <td>147512</td>\r
- </tr>\r
- <tr>\r
-  <td>Denmark</td>\r
-  <td>4271</td>\r
-  <td>5470</td>\r
-  <td>5523</td>\r
-  <td>5590</td>\r
-  <td>5551</td>\r
- </tr>\r
- <tr>\r
-  <td>Djibouti</td>\r
-  <td>62</td>\r
-  <td>864</td>\r
-  <td>953</td>\r
-  <td>1111</td>\r
-  <td>1469</td>\r
- </tr>\r
- <tr>\r
-  <td>Dominica</td>\r
-  <td>51</td>\r
-  <td>67</td>\r
-  <td>67</td>\r
-  <td>68</td>\r
-  <td>66</td>\r
- </tr>\r
- <tr>\r
-  <td>Dominican Republic</td>\r
-  <td>2427</td>\r
-  <td>10090</td>\r
-  <td>10867</td>\r
-  <td>11973</td>\r
-  <td>13441</td>\r
- </tr>\r
- <tr>\r
-  <td>Ecuador</td>\r
-  <td>3387</td>\r
-  <td>13625</td>\r
-  <td>14596</td>\r
-  <td>16074</td>\r
-  <td>17989</td>\r
- </tr>\r
- <tr>\r
-  <td>Egypt</td>\r
-  <td>21514</td>\r
-  <td>82999</td>\r
-  <td>91778</td>\r
-  <td>104970</td>\r
-  <td>129533</td>\r
- </tr>\r
- <tr>\r
-  <td>El Salvador</td>\r
-  <td>2200</td>\r
-  <td>6163</td>\r
-  <td>6383</td>\r
-  <td>6895</td>\r
-  <td>7882</td>\r
- </tr>\r
- <tr>\r
-  <td>Equatorial Guinea</td>\r
-  <td>226</td>\r
-  <td>676</td>\r
-  <td>781</td>\r
-  <td>971</td>\r
-  <td>1445</td>\r
- </tr>\r
- <tr>\r
-  <td>Eritrea</td>\r
-  <td>1141</td>\r
-  <td>5073</td>\r
-  <td>6009</td>\r
-  <td>7404</td>\r
-  <td>10787</td>\r
- </tr>\r
- <tr>\r
-  <td>Estonia</td>\r
-  <td>1101</td>\r
-  <td>1340</td>\r
-  <td>1337</td>\r
-  <td>1321</td>\r
-  <td>1233</td>\r
- </tr>\r
- <tr>\r
-  <td>Ethiopia</td>\r
-  <td>18434</td>\r
-  <td>82825</td>\r
-  <td>96237</td>\r
-  <td>119822</td>\r
-  <td>173811</td>\r
- </tr>\r
- <tr>\r
-  <td>Faeroe Islands</td>\r
-  <td>32</td>\r
-  <td>50</td>\r
-  <td>52</td>\r
-  <td>55</td>\r
-  <td>58</td>\r
- </tr>\r
- <tr>\r
-  <td>Falkland Islands (Malvinas)</td>\r
-  <td>2</td>\r
-  <td>3</td>\r
-  <td>3</td>\r
-  <td>3</td>\r
-  <td>3</td>\r
- </tr>\r
- <tr>\r
-  <td>Fiji</td>\r
-  <td>289</td>\r
-  <td>849</td>\r
-  <td>874</td>\r
-  <td>905</td>\r
-  <td>910</td>\r
- </tr>\r
- <tr>\r
-  <td>Finland</td>\r
-  <td>4009</td>\r
-  <td>5326</td>\r
-  <td>5432</td>\r
-  <td>5533</td>\r
-  <td>5445</td>\r
- </tr>\r
- <tr>\r
-  <td>France</td>\r
-  <td>41832</td>\r
-  <td>62343</td>\r
-  <td>63900</td>\r
-  <td>65769</td>\r
-  <td>67668</td>\r
- </tr>\r
- <tr>\r
-  <td>French Guiana</td>\r
-  <td>25</td>\r
-  <td>226</td>\r
-  <td>261</td>\r
-  <td>323</td>\r
-  <td>462</td>\r
- </tr>\r
- <tr>\r
-  <td>French Polynesia</td>\r
-  <td>61</td>\r
-  <td>269</td>\r
-  <td>289</td>\r
-  <td>318</td>\r
-  <td>354</td>\r
- </tr>\r
- <tr>\r
-  <td>Gabon</td>\r
-  <td>469</td>\r
-  <td>1475</td>\r
-  <td>1639</td>\r
-  <td>1915</td>\r
-  <td>2471</td>\r
- </tr>\r
- <tr>\r
-  <td>Gambia</td>\r
-  <td>258</td>\r
-  <td>1705</td>\r
-  <td>1985</td>\r
-  <td>2478</td>\r
-  <td>3763</td>\r
- </tr>\r
- <tr>\r
-  <td>Georgia</td>\r
-  <td>3527</td>\r
-  <td>4260</td>\r
-  <td>4084</td>\r
-  <td>3888</td>\r
-  <td>3267</td>\r
- </tr>\r
- <tr>\r
-  <td>Germany</td>\r
-  <td>68376</td>\r
-  <td>82167</td>\r
-  <td>81346</td>\r
-  <td>79258</td>\r
-  <td>70504</td>\r
- </tr>\r
- <tr>\r
-  <td>Ghana</td>\r
-  <td>4981</td>\r
-  <td>23837</td>\r
-  <td>26925</td>\r
-  <td>32233</td>\r
-  <td>45213</td>\r
- </tr>\r
- <tr>\r
-  <td>Gibraltar</td>\r
-  <td>20</td>\r
-  <td>31</td>\r
-  <td>31</td>\r
-  <td>32</td>\r
-  <td>30</td>\r
- </tr>\r
- <tr>\r
-  <td>Greece</td>\r
-  <td>7566</td>\r
-  <td>11161</td>\r
-  <td>11261</td>\r
-  <td>11274</td>\r
-  <td>10939</td>\r
- </tr>\r
- <tr>\r
-  <td>Greenland</td>\r
-  <td>23</td>\r
-  <td>57</td>\r
-  <td>57</td>\r
-  <td>56</td>\r
-  <td>50</td>\r
- </tr>\r
- <tr>\r
-  <td>Grenada</td>\r
-  <td>77</td>\r
-  <td>104</td>\r
-  <td>107</td>\r
-  <td>109</td>\r
-  <td>97</td>\r
- </tr>\r
- <tr>\r
-  <td>Guadeloupe</td>\r
-  <td>210</td>\r
-  <td>465</td>\r
-  <td>476</td>\r
-  <td>489</td>\r
-  <td>477</td>\r
- </tr>\r
- <tr>\r
-  <td>Guam</td>\r
-  <td>60</td>\r
-  <td>178</td>\r
-  <td>191</td>\r
-  <td>211</td>\r
-  <td>242</td>\r
- </tr>\r
- <tr>\r
-  <td>Guatemala</td>\r
-  <td>3146</td>\r
-  <td>14027</td>\r
-  <td>16227</td>\r
-  <td>19927</td>\r
-  <td>27480</td>\r
- </tr>\r
- <tr>\r
-  <td>Guinea</td>\r
-  <td>2619</td>\r
-  <td>10069</td>\r
-  <td>11844</td>\r
-  <td>15158</td>\r
-  <td>23975</td>\r
- </tr>\r
- <tr>\r
-  <td>Guinea-Bissau</td>\r
-  <td>518</td>\r
-  <td>1611</td>\r
-  <td>1848</td>\r
-  <td>2296</td>\r
-  <td>3555</td>\r
- </tr>\r
- <tr>\r
-  <td>Guyana</td>\r
-  <td>423</td>\r
-  <td>762</td>\r
-  <td>754</td>\r
-  <td>732</td>\r
-  <td>558</td>\r
- </tr>\r
- <tr>\r
-  <td>Haiti</td>\r
-  <td>3221</td>\r
-  <td>10033</td>\r
-  <td>10957</td>\r
-  <td>12476</td>\r
-  <td>15485</td>\r
- </tr>\r
- <tr>\r
-  <td>Holy See</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
- </tr>\r
- <tr>\r
-  <td>Honduras</td>\r
-  <td>1487</td>\r
-  <td>7466</td>\r
-  <td>8386</td>\r
-  <td>9844</td>\r
-  <td>12402</td>\r
- </tr>\r
- <tr>\r
-  <td>Hungary</td>\r
-  <td>9338</td>\r
-  <td>9993</td>\r
-  <td>9874</td>\r
-  <td>9647</td>\r
-  <td>8934</td>\r
- </tr>\r
- <tr>\r
-  <td>Iceland</td>\r
-  <td>143</td>\r
-  <td>323</td>\r
-  <td>353</td>\r
-  <td>384</td>\r
-  <td>407</td>\r
- </tr>\r
- <tr>\r
-  <td>India</td>\r
-  <td>371857</td>\r
-  <td>1198003</td>\r
-  <td>1294192</td>\r
-  <td>1431272</td>\r
-  <td>1613800</td>\r
- </tr>\r
- <tr>\r
-  <td>Indonesia</td>\r
-  <td>77152</td>\r
-  <td>229965</td>\r
-  <td>244191</td>\r
-  <td>263287</td>\r
-  <td>288110</td>\r
- </tr>\r
- <tr>\r
-  <td>Iran (Islamic Republic of)</td>\r
-  <td>16913</td>\r
-  <td>74196</td>\r
-  <td>79454</td>\r
-  <td>87134</td>\r
-  <td>96975</td>\r
- </tr>\r
- <tr>\r
-  <td>Iraq</td>\r
-  <td>5719</td>\r
-  <td>30747</td>\r
-  <td>35884</td>\r
-  <td>44692</td>\r
-  <td>63995</td>\r
- </tr>\r
- <tr>\r
-  <td>Ireland</td>\r
-  <td>2969</td>\r
-  <td>4515</td>\r
-  <td>4886</td>\r
-  <td>5370</td>\r
-  <td>6295</td>\r
- </tr>\r
- <tr>\r
-  <td>Isle of Man</td>\r
-  <td>55</td>\r
-  <td>80</td>\r
-  <td>81</td>\r
-  <td>80</td>\r
-  <td>75</td>\r
- </tr>\r
- <tr>\r
-  <td>Israel</td>\r
-  <td>1258</td>\r
-  <td>7170</td>\r
-  <td>7823</td>\r
-  <td>8769</td>\r
-  <td>10649</td>\r
- </tr>\r
- <tr>\r
-  <td>Italy</td>\r
-  <td>46367</td>\r
-  <td>59870</td>\r
-  <td>60604</td>\r
-  <td>60018</td>\r
-  <td>57066</td>\r
- </tr>\r
- <tr>\r
-  <td>Jamaica</td>\r
-  <td>1403</td>\r
-  <td>2719</td>\r
-  <td>2786</td>\r
-  <td>2866</td>\r
-  <td>2683</td>\r
- </tr>\r
- <tr>\r
-  <td>Japan</td>\r
-  <td>82824</td>\r
-  <td>127156</td>\r
-  <td>125791</td>\r
-  <td>120793</td>\r
-  <td>101659</td>\r
- </tr>\r
- <tr>\r
-  <td>Jordan</td>\r
-  <td>472</td>\r
-  <td>6316</td>\r
-  <td>6957</td>\r
-  <td>8088</td>\r
-  <td>10241</td>\r
- </tr>\r
- <tr>\r
-  <td>Kazakhstan</td>\r
-  <td>6703</td>\r
-  <td>15637</td>\r
-  <td>16289</td>\r
-  <td>17025</td>\r
-  <td>17848</td>\r
- </tr>\r
- <tr>\r
-  <td>Kenya</td>\r
-  <td>6077</td>\r
-  <td>39802</td>\r
-  <td>46433</td>\r
-  <td>57573</td>\r
-  <td>85410</td>\r
- </tr>\r
- <tr>\r
-  <td>Kiribati</td>\r
-  <td>26</td>\r
-  <td>98</td>\r
-  <td>107</td>\r
-  <td>123</td>\r
-  <td>151</td>\r
- </tr>\r
- <tr>\r
-  <td>Kuwait</td>\r
-  <td>152</td>\r
-  <td>2985</td>\r
-  <td>3378</td>\r
-  <td>3988</td>\r
-  <td>5240</td>\r
- </tr>\r
- <tr>\r
-  <td>Kyrgyzstan</td>\r
-  <td>1740</td>\r
-  <td>5482</td>\r
-  <td>5877</td>\r
-  <td>6378</td>\r
-  <td>6882</td>\r
- </tr>\r
- <tr>\r
-  <td>Lao People's Dem. Republic</td>\r
-  <td>1666</td>\r
-  <td>6320</td>\r
-  <td>7028</td>\r
-  <td>8273</td>\r
-  <td>10744</td>\r
- </tr>\r
- <tr>\r
-  <td>Latvia</td>\r
-  <td>1949</td>\r
-  <td>2249</td>\r
-  <td>2197</td>\r
-  <td>2101</td>\r
-  <td>1854</td>\r
- </tr>\r
- <tr>\r
-  <td>Lebanon</td>\r
-  <td>1443</td>\r
-  <td>4224</td>\r
-  <td>4426</td>\r
-  <td>4736</td>\r
-  <td>5033</td>\r
- </tr>\r
- <tr>\r
-  <td>Lesotho</td>\r
-  <td>734</td>\r
-  <td>2067</td>\r
-  <td>2168</td>\r
-  <td>2306</td>\r
-  <td>2491</td>\r
- </tr>\r
- <tr>\r
-  <td>Liberia</td>\r
-  <td>824</td>\r
-  <td>3955</td>\r
-  <td>4665</td>\r
-  <td>5858</td>\r
-  <td>8841</td>\r
- </tr>\r
- <tr>\r
-  <td>Libyan Arab Jamahiriya</td>\r
-  <td>1029</td>\r
-  <td>6420</td>\r
-  <td>7158</td>\r
-  <td>8144</td>\r
-  <td>9819</td>\r
- </tr>\r
- <tr>\r
-  <td>Liechtenstein</td>\r
-  <td>14</td>\r
-  <td>36</td>\r
-  <td>38</td>\r
-  <td>40</td>\r
-  <td>45</td>\r
- </tr>\r
- <tr>\r
-  <td>Lithuania</td>\r
-  <td>2567</td>\r
-  <td>3287</td>\r
-  <td>3143</td>\r
-  <td>2985</td>\r
-  <td>2579</td>\r
- </tr>\r
- <tr>\r
-  <td>Luxembourg</td>\r
-  <td>296</td>\r
-  <td>486</td>\r
-  <td>520</td>\r
-  <td>582</td>\r
-  <td>733</td>\r
- </tr>\r
- <tr>\r
-  <td>Madagascar</td>\r
-  <td>4084</td>\r
-  <td>19625</td>\r
-  <td>22853</td>\r
-  <td>28595</td>\r
-  <td>42693</td>\r
- </tr>\r
- <tr>\r
-  <td>Malawi</td>\r
-  <td>2881</td>\r
-  <td>15263</td>\r
-  <td>17998</td>\r
-  <td>23194</td>\r
-  <td>36575</td>\r
- </tr>\r
- <tr>\r
-  <td>Malaysia</td>\r
-  <td>6110</td>\r
-  <td>27468</td>\r
-  <td>30041</td>\r
-  <td>33770</td>\r
-  <td>39664</td>\r
- </tr>\r
- <tr>\r
-  <td>Maldives</td>\r
-  <td>82</td>\r
-  <td>309</td>\r
-  <td>338</td>\r
-  <td>384</td>\r
-  <td>455</td>\r
- </tr>\r
- <tr>\r
-  <td>Mali</td>\r
-  <td>4268</td>\r
-  <td>13010</td>\r
-  <td>14993</td>\r
-  <td>18603</td>\r
-  <td>28260</td>\r
- </tr>\r
- <tr>\r
-  <td>Malta</td>\r
-  <td>312</td>\r
-  <td>409</td>\r
-  <td>417</td>\r
-  <td>426</td>\r
-  <td>413</td>\r
- </tr>\r
- <tr>\r
-  <td>Marshall Islands</td>\r
-  <td>13</td>\r
-  <td>62</td>\r
-  <td>70</td>\r
-  <td>79</td>\r
-  <td>92</td>\r
- </tr>\r
- <tr>\r
-  <td>Martinique</td>\r
-  <td>222</td>\r
-  <td>405</td>\r
-  <td>411</td>\r
-  <td>418</td>\r
-  <td>393</td>\r
- </tr>\r
- <tr>\r
-  <td>Mauritania</td>\r
-  <td>651</td>\r
-  <td>3291</td>\r
-  <td>3732</td>\r
-  <td>4443</td>\r
-  <td>6061</td>\r
- </tr>\r
- <tr>\r
-  <td>Mauritius</td>\r
-  <td>493</td>\r
-  <td>1288</td>\r
-  <td>1337</td>\r
-  <td>1400</td>\r
-  <td>1426</td>\r
- </tr>\r
- <tr>\r
-  <td>Mayotte</td>\r
-  <td>15</td>\r
-  <td>194</td>\r
-  <td>224</td>\r
-  <td>277</td>\r
-  <td>386</td>\r
- </tr>\r
- <tr>\r
-  <td>Mexico</td>\r
-  <td>27741</td>\r
-  <td>109610</td>\r
-  <td>115528</td>\r
-  <td>123366</td>\r
-  <td>128964</td>\r
- </tr>\r
- <tr>\r
-  <td>Micronesia (Fed. States of)</td>\r
-  <td>32</td>\r
-  <td>111</td>\r
-  <td>114</td>\r
-  <td>122</td>\r
-  <td>128</td>\r
- </tr>\r
- <tr>\r
-  <td>Moldova (Republic of)</td>\r
-  <td>2341</td>\r
-  <td>3604</td>\r
-  <td>3462</td>\r
-  <td>3291</td>\r
-  <td>2734</td>\r
- </tr>\r
- <tr>\r
-  <td>Monaco</td>\r
-  <td>20</td>\r
-  <td>33</td>\r
-  <td>33</td>\r
-  <td>35</td>\r
-  <td>38</td>\r
- </tr>\r
- <tr>\r
-  <td>Mongolia</td>\r
-  <td>761</td>\r
-  <td>2671</td>\r
-  <td>2855</td>\r
-  <td>3134</td>\r
-  <td>3446</td>\r
- </tr>\r
- <tr>\r
-  <td>Montenegro</td>\r
-  <td>399</td>\r
-  <td>624</td>\r
-  <td>627</td>\r
-  <td>633</td>\r
-  <td>618</td>\r
- </tr>\r
- <tr>\r
-  <td>Montserrat</td>\r
-  <td>14</td>\r
-  <td>6</td>\r
-  <td>6</td>\r
-  <td>7</td>\r
-  <td>7</td>\r
- </tr>\r
- <tr>\r
-  <td>Morocco</td>\r
-  <td>8953</td>\r
-  <td>31993</td>\r
-  <td>34330</td>\r
-  <td>37865</td>\r
-  <td>42583</td>\r
- </tr>\r
- <tr>\r
-  <td>Mozambique</td>\r
-  <td>6442</td>\r
-  <td>22894</td>\r
-  <td>25957</td>\r
-  <td>31190</td>\r
-  <td>44148</td>\r
- </tr>\r
- <tr>\r
-  <td>Myanmar</td>\r
-  <td>17158</td>\r
-  <td>50020</td>\r
-  <td>53087</td>\r
-  <td>57585</td>\r
-  <td>63373</td>\r
- </tr>\r
- <tr>\r
-  <td>Namibia</td>\r
-  <td>485</td>\r
-  <td>2171</td>\r
-  <td>2412</td>\r
-  <td>2810</td>\r
-  <td>3588</td>\r
- </tr>\r
- <tr>\r
-  <td>Nauru</td>\r
-  <td>3</td>\r
-  <td>10</td>\r
-  <td>11</td>\r
-  <td>11</td>\r
-  <td>11</td>\r
- </tr>\r
- <tr>\r
-  <td>Nepal</td>\r
-  <td>8126</td>\r
-  <td>29331</td>\r
-  <td>32503</td>\r
-  <td>38031</td>\r
-  <td>49028</td>\r
- </tr>\r
- <tr>\r
-  <td>Netherlands</td>\r
-  <td>10114</td>\r
-  <td>16592</td>\r
-  <td>16915</td>\r
-  <td>17348</td>\r
-  <td>17399</td>\r
- </tr>\r
- <tr>\r
-  <td>Netherlands Antilles</td>\r
-  <td>112</td>\r
-  <td>198</td>\r
-  <td>207</td>\r
-  <td>210</td>\r
-  <td>192</td>\r
- </tr>\r
- <tr>\r
-  <td>New Caledonia</td>\r
-  <td>65</td>\r
-  <td>250</td>\r
-  <td>271</td>\r
-  <td>304</td>\r
-  <td>362</td>\r
- </tr>\r
- <tr>\r
-  <td>New Zealand</td>\r
-  <td>1908</td>\r
-  <td>4266</td>\r
-  <td>4492</td>\r
-  <td>4831</td>\r
-  <td>5349</td>\r
- </tr>\r
- <tr>\r
-  <td>Nicaragua</td>\r
-  <td>1295</td>\r
-  <td>5743</td>\r
-  <td>6265</td>\r
-  <td>7058</td>\r
-  <td>8143</td>\r
- </tr>\r
- <tr>\r
-  <td>Niger</td>\r
-  <td>2462</td>\r
-  <td>15290</td>\r
-  <td>19150</td>\r
-  <td>27388</td>\r
-  <td>58216</td>\r
- </tr>\r
- <tr>\r
-  <td>Nigeria</td>\r
-  <td>36680</td>\r
-  <td>154729</td>\r
-  <td>175928</td>\r
-  <td>210057</td>\r
-  <td>289083</td>\r
- </tr>\r
- <tr>\r
-  <td>Niue</td>\r
-  <td>5</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
- </tr>\r
- <tr>\r
-  <td>Northern Mariana Islands</td>\r
-  <td>7</td>\r
-  <td>87</td>\r
-  <td>96</td>\r
-  <td>111</td>\r
-  <td>151</td>\r
- </tr>\r
- <tr>\r
-  <td>Norway</td>\r
-  <td>3265</td>\r
-  <td>4812</td>\r
-  <td>5036</td>\r
-  <td>5365</td>\r
-  <td>5947</td>\r
- </tr>\r
- <tr>\r
-  <td>Occupied Palestinian Territory</td>\r
-  <td>1005</td>\r
-  <td>4277</td>\r
-  <td>5090</td>\r
-  <td>6553</td>\r
-  <td>10265</td>\r
- </tr>\r
- <tr>\r
-  <td>Oman</td>\r
-  <td>456</td>\r
-  <td>2845</td>\r
-  <td>3198</td>\r
-  <td>3782</td>\r
-  <td>4878</td>\r
- </tr>\r
- <tr>\r
-  <td>Pakistan</td>\r
-  <td>41177</td>\r
-  <td>180808</td>\r
-  <td>205504</td>\r
-  <td>246286</td>\r
-  <td>335195</td>\r
- </tr>\r
- <tr>\r
-  <td>Palau</td>\r
-  <td>7</td>\r
-  <td>20</td>\r
-  <td>21</td>\r
-  <td>23</td>\r
-  <td>26</td>\r
- </tr>\r
- <tr>\r
-  <td>Panama</td>\r
-  <td>860</td>\r
-  <td>3454</td>\r
-  <td>3773</td>\r
-  <td>4267</td>\r
-  <td>5092</td>\r
- </tr>\r
- <tr>\r
-  <td>Papua New Guinea</td>\r
-  <td>1798</td>\r
-  <td>6732</td>\r
-  <td>7678</td>\r
-  <td>9265</td>\r
-  <td>12871</td>\r
- </tr>\r
- <tr>\r
-  <td>Paraguay</td>\r
-  <td>1473</td>\r
-  <td>6349</td>\r
-  <td>7007</td>\r
-  <td>8026</td>\r
-  <td>9867</td>\r
- </tr>\r
- <tr>\r
-  <td>Peru</td>\r
-  <td>7632</td>\r
-  <td>29165</td>\r
-  <td>31197</td>\r
-  <td>34528</td>\r
-  <td>39776</td>\r
- </tr>\r
- <tr>\r
-  <td>Philippines</td>\r
-  <td>19996</td>\r
-  <td>91983</td>\r
-  <td>101734</td>\r
-  <td>117270</td>\r
-  <td>146156</td>\r
- </tr>\r
- <tr>\r
-  <td>Pitcairn</td>\r
-  <td>0</td>\r
-  <td>0</td>\r
-  <td>0</td>\r
-  <td>0</td>\r
-  <td>0</td>\r
- </tr>\r
- <tr>\r
-  <td>Poland</td>\r
-  <td>24824</td>\r
-  <td>38074</td>\r
-  <td>37788</td>\r
-  <td>36964</td>\r
-  <td>32013</td>\r
- </tr>\r
- <tr>\r
-  <td>Portugal</td>\r
-  <td>8405</td>\r
-  <td>10707</td>\r
-  <td>10787</td>\r
-  <td>10706</td>\r
-  <td>10015</td>\r
- </tr>\r
- <tr>\r
-  <td>Puerto Rico</td>\r
-  <td>2218</td>\r
-  <td>3982</td>\r
-  <td>4074</td>\r
-  <td>4176</td>\r
-  <td>4103</td>\r
- </tr>\r
- <tr>\r
-  <td>Qatar</td>\r
-  <td>25</td>\r
-  <td>1409</td>\r
-  <td>1630</td>\r
-  <td>1848</td>\r
-  <td>2316</td>\r
- </tr>\r
- <tr>\r
-  <td>Republic of Korea</td>\r
-  <td>19211</td>\r
-  <td>48333</td>\r
-  <td>49153</td>\r
-  <td>49484</td>\r
-  <td>44077</td>\r
- </tr>\r
- <tr>\r
-  <td>Réunion</td>\r
-  <td>248</td>\r
-  <td>827</td>\r
-  <td>886</td>\r
-  <td>973</td>\r
-  <td>1096</td>\r
- </tr>\r
- <tr>\r
-  <td>Romania</td>\r
-  <td>16311</td>\r
-  <td>21275</td>\r
-  <td>20787</td>\r
-  <td>19961</td>\r
-  <td>17279</td>\r
- </tr>\r
- <tr>\r
-  <td>Russian Federation</td>\r
-  <td>102702</td>\r
-  <td>140874</td>\r
-  <td>137983</td>\r
-  <td>132345</td>\r
-  <td>116097</td>\r
- </tr>\r
- <tr>\r
-  <td>Rwanda</td>\r
-  <td>2162</td>\r
-  <td>9998</td>\r
-  <td>11743</td>\r
-  <td>14676</td>\r
-  <td>22082</td>\r
- </tr>\r
- <tr>\r
-  <td>Saint Helena</td>\r
-  <td>5</td>\r
-  <td>4</td>\r
-  <td>4</td>\r
-  <td>5</td>\r
-  <td>5</td>\r
- </tr>\r
- <tr>\r
-  <td>Saint Kitts and Nevis</td>\r
-  <td>46</td>\r
-  <td>52</td>\r
-  <td>56</td>\r
-  <td>61</td>\r
-  <td>69</td>\r
- </tr>\r
- <tr>\r
-  <td>Saint Lucia</td>\r
-  <td>83</td>\r
-  <td>172</td>\r
-  <td>182</td>\r
-  <td>198</td>\r
-  <td>217</td>\r
- </tr>\r
- <tr>\r
-  <td>Saint Pierre and Miquelon</td>\r
-  <td>5</td>\r
-  <td>6</td>\r
-  <td>6</td>\r
-  <td>6</td>\r
-  <td>6</td>\r
- </tr>\r
- <tr>\r
-  <td>St. Vincent and the Grenadines</td>\r
-  <td>67</td>\r
-  <td>109</td>\r
-  <td>110</td>\r
-  <td>111</td>\r
-  <td>119</td>\r
- </tr>\r
- <tr>\r
-  <td>Samoa</td>\r
-  <td>82</td>\r
-  <td>179</td>\r
-  <td>181</td>\r
-  <td>188</td>\r
-  <td>192</td>\r
- </tr>\r
- <tr>\r
-  <td>San Marino</td>\r
-  <td>13</td>\r
-  <td>31</td>\r
-  <td>32</td>\r
-  <td>33</td>\r
-  <td>33</td>\r
- </tr>\r
- <tr>\r
-  <td>Sao Tome and Principe</td>\r
-  <td>60</td>\r
-  <td>163</td>\r
-  <td>180</td>\r
-  <td>216</td>\r
-  <td>296</td>\r
- </tr>\r
- <tr>\r
-  <td>Saudi Arabia</td>\r
-  <td>3201</td>\r
-  <td>25721</td>\r
-  <td>28933</td>\r
-  <td>34176</td>\r
-  <td>43658</td>\r
- </tr>\r
- <tr>\r
-  <td>Senegal</td>\r
-  <td>2416</td>\r
-  <td>12534</td>\r
-  <td>14526</td>\r
-  <td>17861</td>\r
-  <td>26102</td>\r
- </tr>\r
- <tr>\r
-  <td>Serbia</td>\r
-  <td>6732</td>\r
-  <td>9850</td>\r
-  <td>9828</td>\r
-  <td>9720</td>\r
-  <td>9193</td>\r
- </tr>\r
- <tr>\r
-  <td>Seychelles</td>\r
-  <td>36</td>\r
-  <td>84</td>\r
-  <td>86</td>\r
-  <td>91</td>\r
-  <td>97</td>\r
- </tr>\r
- <tr>\r
-  <td>Sierra Leone</td>\r
-  <td>1944</td>\r
-  <td>5696</td>\r
-  <td>6557</td>\r
-  <td>8112</td>\r
-  <td>12446</td>\r
- </tr>\r
- <tr>\r
-  <td>Singapore</td>\r
-  <td>1022</td>\r
-  <td>4737</td>\r
-  <td>5059</td>\r
-  <td>5362</td>\r
-  <td>5221</td>\r
- </tr>\r
- <tr>\r
-  <td>Slovakia</td>\r
-  <td>3463</td>\r
-  <td>5406</td>\r
-  <td>5437</td>\r
-  <td>5413</td>\r
-  <td>4917</td>\r
- </tr>\r
- <tr>\r
-  <td>Slovenia</td>\r
-  <td>1473</td>\r
-  <td>2020</td>\r
-  <td>2044</td>\r
-  <td>2050</td>\r
-  <td>1954</td>\r
- </tr>\r
- <tr>\r
-  <td>Solomon Islands</td>\r
-  <td>90</td>\r
-  <td>523</td>\r
-  <td>599</td>\r
-  <td>725</td>\r
-  <td>1007</td>\r
- </tr>\r
- <tr>\r
-  <td>Somalia</td>\r
-  <td>2264</td>\r
-  <td>9133</td>\r
-  <td>10731</td>\r
-  <td>13922</td>\r
-  <td>23522</td>\r
- </tr>\r
- <tr>\r
-  <td>South Africa</td>\r
-  <td>13683</td>\r
-  <td>50110</td>\r
-  <td>51684</td>\r
-  <td>53766</td>\r
-  <td>56802</td>\r
- </tr>\r
- <tr>\r
-  <td>Spain</td>\r
-  <td>28009</td>\r
-  <td>44904</td>\r
-  <td>47203</td>\r
-  <td>49265</td>\r
-  <td>51260</td>\r
- </tr>\r
- <tr>\r
-  <td>Sri Lanka</td>\r
-  <td>8241</td>\r
-  <td>20238</td>\r
-  <td>21167</td>\r
-  <td>22033</td>\r
-  <td>21705</td>\r
- </tr>\r
- <tr>\r
-  <td>Sudan</td>\r
-  <td>9190</td>\r
-  <td>42272</td>\r
-  <td>47730</td>\r
-  <td>56688</td>\r
-  <td>75884</td>\r
- </tr>\r
- <tr>\r
-  <td>Suriname</td>\r
-  <td>215</td>\r
-  <td>520</td>\r
-  <td>547</td>\r
-  <td>586</td>\r
-  <td>619</td>\r
- </tr>\r
- <tr>\r
-  <td>Swaziland</td>\r
-  <td>273</td>\r
-  <td>1185</td>\r
-  <td>1287</td>\r
-  <td>1455</td>\r
-  <td>1749</td>\r
- </tr>\r
- <tr>\r
-  <td>Sweden</td>\r
-  <td>7014</td>\r
-  <td>9249</td>\r
-  <td>9498</td>\r
-  <td>9915</td>\r
-  <td>10571</td>\r
- </tr>\r
- <tr>\r
-  <td>Switzerland</td>\r
-  <td>4693</td>\r
-  <td>7568</td>\r
-  <td>7736</td>\r
-  <td>8020</td>\r
-  <td>8514</td>\r
- </tr>\r
- <tr>\r
-  <td>Syrian Arab Republic</td>\r
-  <td>3536</td>\r
-  <td>21906</td>\r
-  <td>24494</td>\r
-  <td>28592</td>\r
-  <td>36911</td>\r
- </tr>\r
- <tr>\r
-  <td>Tajikistan</td>\r
-  <td>1532</td>\r
-  <td>6952</td>\r
-  <td>7761</td>\r
-  <td>9075</td>\r
-  <td>11111</td>\r
- </tr>\r
- <tr>\r
-  <td>TFYR Macedonia</td>\r
-  <td>1230</td>\r
-  <td>2042</td>\r
-  <td>2045</td>\r
-  <td>2037</td>\r
-  <td>1857</td>\r
- </tr>\r
- <tr>\r
-  <td>Thailand</td>\r
-  <td>20607</td>\r
-  <td>67764</td>\r
-  <td>69939</td>\r
-  <td>72628</td>\r
-  <td>73361</td>\r
- </tr>\r
- <tr>\r
-  <td>Timor-Leste</td>\r
-  <td>433</td>\r
-  <td>1134</td>\r
-  <td>1385</td>\r
-  <td>1869</td>\r
-  <td>3217</td>\r
- </tr>\r
- <tr>\r
-  <td>Togo</td>\r
-  <td>1329</td>\r
-  <td>6619</td>\r
-  <td>7607</td>\r
-  <td>9282</td>\r
-  <td>13196</td>\r
- </tr>\r
- <tr>\r
-  <td>Tokelau</td>\r
-  <td>2</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
-  <td>1</td>\r
- </tr>\r
- <tr>\r
-  <td>Tonga</td>\r
-  <td>47</td>\r
-  <td>104</td>\r
-  <td>105</td>\r
-  <td>112</td>\r
-  <td>123</td>\r
- </tr>\r
- <tr>\r
-  <td>Trinidad and Tobago</td>\r
-  <td>636</td>\r
-  <td>1339</td>\r
-  <td>1368</td>\r
-  <td>1388</td>\r
-  <td>1278</td>\r
- </tr>\r
- <tr>\r
-  <td>Tunisia</td>\r
-  <td>3530</td>\r
-  <td>10272</td>\r
-  <td>10884</td>\r
-  <td>11797</td>\r
-  <td>12711</td>\r
- </tr>\r
- <tr>\r
-  <td>Turkey</td>\r
-  <td>21484</td>\r
-  <td>74816</td>\r
-  <td>79966</td>\r
-  <td>87364</td>\r
-  <td>97389</td>\r
- </tr>\r
- <tr>\r
-  <td>Turkmenistan</td>\r
-  <td>1211</td>\r
-  <td>5110</td>\r
-  <td>5509</td>\r
-  <td>6072</td>\r
-  <td>6796</td>\r
- </tr>\r
- <tr>\r
-  <td>Turks and Caicos Islands</td>\r
-  <td>5</td>\r
-  <td>33</td>\r
-  <td>35</td>\r
-  <td>38</td>\r
-  <td>40</td>\r
- </tr>\r
- <tr>\r
-  <td>Tuvalu</td>\r
-  <td>5</td>\r
-  <td>10</td>\r
-  <td>10</td>\r
-  <td>11</td>\r
-  <td>11</td>\r
- </tr>\r
- <tr>\r
-  <td>Uganda</td>\r
-  <td>5158</td>\r
-  <td>32710</td>\r
-  <td>39710</td>\r
-  <td>53406</td>\r
-  <td>91271</td>\r
- </tr>\r
- <tr>\r
-  <td>Ukraine</td>\r
-  <td>37298</td>\r
-  <td>45708</td>\r
-  <td>44165</td>\r
-  <td>41617</td>\r
-  <td>35026</td>\r
- </tr>\r
- <tr>\r
-  <td>United Arab Emirates</td>\r
-  <td>70</td>\r
-  <td>4599</td>\r
-  <td>5193</td>\r
-  <td>6109</td>\r
-  <td>8253</td>\r
- </tr>\r
- <tr>\r
-  <td>United Kingdom</td>\r
-  <td>50616</td>\r
-  <td>61565</td>\r
-  <td>63528</td>\r
-  <td>66601</td>\r
-  <td>72365</td>\r
- </tr>\r
- <tr>\r
-  <td>United Republic of Tanzania</td>\r
-  <td>7650</td>\r
-  <td>43739</td>\r
-  <td>52109</td>\r
-  <td>67394</td>\r
-  <td>109450</td>\r
- </tr>\r
- <tr>\r
-  <td>United States of America</td>\r
-  <td>157813</td>\r
-  <td>314659</td>\r
-  <td>332334</td>\r
-  <td>358735</td>\r
-  <td>403932</td>\r
- </tr>\r
- <tr>\r
-  <td>United States Virgin Islands</td>\r
-  <td>27</td>\r
-  <td>110</td>\r
-  <td>108</td>\r
-  <td>103</td>\r
-  <td>75</td>\r
- </tr>\r
- <tr>\r
-  <td>Uruguay</td>\r
-  <td>2239</td>\r
-  <td>3361</td>\r
-  <td>3430</td>\r
-  <td>3546</td>\r
-  <td>3637</td>\r
- </tr>\r
- <tr>\r
-  <td>Uzbekistan</td>\r
-  <td>6314</td>\r
-  <td>27488</td>\r
-  <td>29456</td>\r
-  <td>32715</td>\r
-  <td>36439</td>\r
- </tr>\r
- <tr>\r
-  <td>Vanuatu</td>\r
-  <td>48</td>\r
-  <td>240</td>\r
-  <td>276</td>\r
-  <td>338</td>\r
-  <td>482</td>\r
- </tr>\r
- <tr>\r
-  <td>Venezuela (Bolivarian Republic of)</td>\r
-  <td>5094</td>\r
-  <td>28583</td>\r
-  <td>31292</td>\r
-  <td>35370</td>\r
-  <td>42042</td>\r
- </tr>\r
- <tr>\r
-  <td>Viet Nam</td>\r
-  <td>27367</td>\r
-  <td>88069</td>\r
-  <td>93647</td>\r
-  <td>102054</td>\r
-  <td>111666</td>\r
- </tr>\r
- <tr>\r
-  <td>Wallis and Futuna Islands</td>\r
-  <td>7</td>\r
-  <td>15</td>\r
-  <td>16</td>\r
-  <td>17</td>\r
-  <td>17</td>\r
- </tr>\r
- <tr>\r
-  <td>Western Sahara</td>\r
-  <td>14</td>\r
-  <td>513</td>\r
-  <td>625</td>\r
-  <td>775</td>\r
-  <td>938</td>\r
- </tr>\r
- <tr>\r
-  <td>Yemen</td>\r
-  <td>4316</td>\r
-  <td>23580</td>\r
-  <td>27819</td>\r
-  <td>35509</td>\r
-  <td>53689</td>\r
- </tr>\r
- <tr>\r
-  <td>Zambia</td>\r
-  <td>2340</td>\r
-  <td>12935</td>\r
-  <td>14980</td>\r
-  <td>18890</td>\r
-  <td>28957</td>\r
- </tr>\r
- <tr>\r
-  <td>Zimbabwe</td>\r
-  <td>2747</td>\r
-  <td>12523</td>\r
-  <td>14029</td>\r
-  <td>16780</td>\r
-  <td>22178</td>\r
- </tr>\r
+ <tr>  <td>Afghanistan</td>  <td>8151</td>  <td>28150</td>  <td>34246</td>  <td>44970</td>  <td>73938</td> </tr>\r
+ <tr>  <td>Albania</td>  <td>1215</td>  <td>3155</td>  <td>3256</td>  <td>3395</td>  <td>3303</td> </tr>\r
+ <tr>  <td>Algeria</td>  <td>8753</td>  <td>34895</td>  <td>38088</td>  <td>42882</td>  <td>49610</td> </tr>\r
+ <tr>  <td>American Samoa</td>  <td>19</td>  <td>67</td>  <td>74</td>  <td>86</td>  <td>107</td> </tr>\r
+ <tr>  <td>Andorra</td>  <td>6</td>  <td>86</td>  <td>93</td>  <td>107</td>  <td>137</td> </tr>\r
+ <tr>  <td>Angola</td>  <td>4148</td>  <td>18498</td>  <td>21690</td>  <td>27441</td>  <td>42267</td> </tr>\r
+ <tr>  <td>Anguilla</td>  <td>5</td>  <td>15</td>  <td>17</td>  <td>18</td>  <td>20</td> </tr>\r
+ <tr>  <td>Antigua and Barbuda</td>  <td>46</td>  <td>88</td>  <td>93</td>  <td>101</td>  <td>112</td> </tr>\r
+ <tr>  <td>Argentina</td>  <td>17150</td>  <td>40276</td>  <td>42548</td>  <td>45883</td>  <td>50943</td> </tr>\r
+ <tr>  <td>Armenia</td>  <td>1354</td>  <td>3083</td>  <td>3139</td>  <td>3181</td>  <td>3018</td> </tr>\r
+ <tr>  <td>Aruba</td>  <td>38</td>  <td>107</td>  <td>109</td>  <td>112</td>  <td>106</td> </tr>\r
+ <tr>  <td>Australia</td>  <td>8219</td>  <td>21293</td>  <td>22607</td>  <td>24703</td>  <td>28724</td> </tr>\r
+ <tr>  <td>Austria</td>  <td>6936</td>  <td>8364</td>  <td>8467</td>  <td>8600</td>  <td>8515</td> </tr>\r
+ <tr>  <td>Azerbaijan</td>  <td>2896</td>  <td>8832</td>  <td>9426</td>  <td>10128</td>  <td>10579</td> </tr>\r
+ <tr>  <td>Bahamas</td>  <td>79</td>  <td>342</td>  <td>366</td>  <td>402</td>  <td>455</td> </tr>\r
+ <tr>  <td>Bahrain</td>  <td>116</td>  <td>791</td>  <td>882</td>  <td>1021</td>  <td>1277</td> </tr>\r
+ <tr>  <td>Bangladesh</td>  <td>43595</td>  <td>162221</td>  <td>175217</td>  <td>195012</td>  <td>222495</td> </tr>\r
+ <tr>  <td>Barbados</td>  <td>211</td>  <td>256</td>  <td>260</td>  <td>262</td>  <td>237</td> </tr>\r
+ <tr>  <td>Belarus</td>  <td>7745</td>  <td>9634</td>  <td>9355</td>  <td>8851</td>  <td>7275</td> </tr>\r
+ <tr>  <td>Belgium</td>  <td>8628</td>  <td>10647</td>  <td>10878</td>  <td>11191</td>  <td>11493</td> </tr>\r
+ <tr>  <td>Belize</td>  <td>69</td>  <td>307</td>  <td>344</td>  <td>404</td>  <td>506</td> </tr>\r
+ <tr>  <td>Benin</td>  <td>2050</td>  <td>8935</td>  <td>10647</td>  <td>13767</td>  <td>21982</td> </tr>\r
+ <tr>  <td>Bermuda</td>  <td>37</td>  <td>65</td>  <td>65</td>  <td>66</td>  <td>63</td> </tr>\r
+ <tr>  <td>Bhutan</td>  <td>168</td>  <td>697</td>  <td>770</td>  <td>865</td>  <td>1013</td> </tr>\r
+ <tr>  <td>Bolivia</td>  <td>2714</td>  <td>9863</td>  <td>10854</td>  <td>12368</td>  <td>14908</td> </tr>\r
+ <tr>  <td>Bosnia and Herzegovina</td>  <td>2661</td>  <td>3767</td>  <td>3727</td>  <td>3608</td>  <td>3008</td> </tr>\r
+ <tr>  <td>Botswana</td>  <td>413</td>  <td>1950</td>  <td>2106</td>  <td>2337</td>  <td>2758</td> </tr>\r
+ <tr>  <td>Brazil</td>  <td>53975</td>  <td>193734</td>  <td>202866</td>  <td>213802</td>  <td>218512</td> </tr>\r
+ <tr>  <td>British Virgin Islands</td>  <td>7</td>  <td>23</td>  <td>24</td>  <td>26</td>  <td>28</td> </tr>\r
+ <tr>  <td>Brunei Darussalam</td>  <td>48</td>  <td>400</td>  <td>443</td>  <td>513</td>  <td>658</td> </tr>\r
+ <tr>  <td>Bulgaria</td>  <td>7251</td>  <td>7545</td>  <td>7263</td>  <td>6752</td>  <td>5392</td> </tr>\r
+ <tr>  <td>Burkina Faso</td>  <td>4080</td>  <td>15757</td>  <td>19013</td>  <td>24837</td>  <td>40830</td> </tr>\r
+ <tr>  <td>Burundi</td>  <td>2456</td>  <td>8303</td>  <td>9413</td>  <td>11161</td>  <td>14846</td> </tr>\r
+ <tr>  <td>Cambodia</td>  <td>4346</td>  <td>14805</td>  <td>16357</td>  <td>18973</td>  <td>23795</td> </tr>\r
+ <tr>  <td>Cameroon</td>  <td>4466</td>  <td>19522</td>  <td>22169</td>  <td>26478</td>  <td>36736</td> </tr>\r
+ <tr>  <td>Canada</td>  <td>13737</td>  <td>33573</td>  <td>35493</td>  <td>38659</td>  <td>44414</td> </tr>\r
+ <tr>  <td>Cape Verde</td>  <td>146</td>  <td>506</td>  <td>548</td>  <td>616</td>  <td>703</td> </tr>\r
+ <tr>  <td>Cayman Islands</td>  <td>7</td>  <td>56</td>  <td>59</td>  <td>63</td>  <td>66</td> </tr>\r
+ <tr>  <td>Central African Republic</td>  <td>1327</td>  <td>4422</td>  <td>4927</td>  <td>5747</td>  <td>7603</td> </tr>\r
+ <tr>  <td>Chad</td>  <td>2429</td>  <td>11206</td>  <td>13120</td>  <td>16906</td>  <td>27776</td> </tr>\r
+ <tr>  <td>Channel Islands</td>  <td>102</td>  <td>150</td>  <td>151</td>  <td>152</td>  <td>144</td> </tr>\r
+ <tr>  <td>Chile</td>  <td>6082</td>  <td>16970</td>  <td>17926</td>  <td>19266</td>  <td>20657</td> </tr>\r
+ <tr>  <td>China</td>  <td>544951</td>  <td>1345751</td>  <td>1395998</td>  <td>1453140</td>  <td>1417045</td> </tr>\r
+ <tr>  <td>China, Hong Kong SAR</td>  <td>1974</td>  <td>7022</td>  <td>7398</td>  <td>7969</td>  <td>8623</td> </tr>\r
+ <tr>  <td>China, Macao SAR</td>  <td>190</td>  <td>538</td>  <td>568</td>  <td>603</td>  <td>593</td> </tr>\r
+ <tr>  <td>Colombia</td>  <td>12000</td>  <td>45660</td>  <td>49385</td>  <td>54920</td>  <td>62877</td> </tr>\r
+ <tr>  <td>Comoros</td>  <td>156</td>  <td>676</td>  <td>767</td>  <td>907</td>  <td>1226</td> </tr>\r
+ <tr>  <td>Congo</td>  <td>808</td>  <td>3683</td>  <td>4225</td>  <td>5094</td>  <td>6863</td> </tr>\r
+ <tr>  <td>Cook Islands</td>  <td>15</td>  <td>20</td>  <td>20</td>  <td>21</td>  <td>24</td> </tr>\r
+ <tr>  <td>Costa Rica</td>  <td>966</td>  <td>4579</td>  <td>4957</td>  <td>5521</td>  <td>6373</td> </tr>\r
+ <tr>  <td>Côte d'Ivoire</td>  <td>2505</td>  <td>21075</td>  <td>24210</td>  <td>29738</td>  <td>43373</td> </tr>\r
+ <tr>  <td>Croatia</td>  <td>3850</td>  <td>4416</td>  <td>4370</td>  <td>4254</td>  <td>3825</td> </tr>\r
+ <tr>  <td>Cuba</td>  <td>5920</td>  <td>11204</td>  <td>11213</td>  <td>11148</td>  <td>9725</td> </tr>\r
+ <tr>  <td>Cyprus</td>  <td>494</td>  <td>871</td>  <td>925</td>  <td>1014</td>  <td>1175</td> </tr>\r
+ <tr>  <td>Czech Republic</td>  <td>8925</td>  <td>10369</td>  <td>10510</td>  <td>10573</td>  <td>10294</td> </tr>\r
+ <tr>  <td>Dem. People's Rep. of Korea</td>  <td>9737</td>  <td>23906</td>  <td>24399</td>  <td>25128</td>  <td>24562</td> </tr>\r
+ <tr>  <td>Dem. Republic of the Congo</td>  <td>12184</td>  <td>66020</td>  <td>77419</td>  <td>98123</td>  <td>147512</td> </tr>\r
+ <tr>  <td>Denmark</td>  <td>4271</td>  <td>5470</td>  <td>5523</td>  <td>5590</td>  <td>5551</td> </tr>\r
+ <tr>  <td>Djibouti</td>  <td>62</td>  <td>864</td>  <td>953</td>  <td>1111</td>  <td>1469</td> </tr>\r
+ <tr>  <td>Dominica</td>  <td>51</td>  <td>67</td>  <td>67</td>  <td>68</td>  <td>66</td> </tr>\r
+ <tr>  <td>Dominican Republic</td>  <td>2427</td>  <td>10090</td>  <td>10867</td>  <td>11973</td>  <td>13441</td> </tr>\r
+ <tr>  <td>Ecuador</td>  <td>3387</td>  <td>13625</td>  <td>14596</td>  <td>16074</td>  <td>17989</td> </tr>\r
+ <tr>  <td>Egypt</td>  <td>21514</td>  <td>82999</td>  <td>91778</td>  <td>104970</td>  <td>129533</td> </tr>\r
+ <tr>  <td>El Salvador</td>  <td>2200</td>  <td>6163</td>  <td>6383</td>  <td>6895</td>  <td>7882</td> </tr>\r
+ <tr>  <td>Equatorial Guinea</td>  <td>226</td>  <td>676</td>  <td>781</td>  <td>971</td>  <td>1445</td> </tr>\r
+ <tr>  <td>Eritrea</td>  <td>1141</td>  <td>5073</td>  <td>6009</td>  <td>7404</td>  <td>10787</td> </tr>\r
+ <tr>  <td>Estonia</td>  <td>1101</td>  <td>1340</td>  <td>1337</td>  <td>1321</td>  <td>1233</td> </tr>\r
+ <tr>  <td>Ethiopia</td>  <td>18434</td>  <td>82825</td>  <td>96237</td>  <td>119822</td>  <td>173811</td> </tr>\r
+ <tr>  <td>Faeroe Islands</td>  <td>32</td>  <td>50</td>  <td>52</td>  <td>55</td>  <td>58</td> </tr>\r
+ <tr>  <td>Falkland Islands (Malvinas)</td>  <td>2</td>  <td>3</td>  <td>3</td>  <td>3</td>  <td>3</td> </tr>\r
+ <tr>  <td>Fiji</td>  <td>289</td>  <td>849</td>  <td>874</td>  <td>905</td>  <td>910</td> </tr>\r
+ <tr>  <td>Finland</td>  <td>4009</td>  <td>5326</td>  <td>5432</td>  <td>5533</td>  <td>5445</td> </tr>\r
+ <tr>  <td>France</td>  <td>41832</td>  <td>62343</td>  <td>63900</td>  <td>65769</td>  <td>67668</td> </tr>\r
+ <tr>  <td>French Guiana</td>  <td>25</td>  <td>226</td>  <td>261</td>  <td>323</td>  <td>462</td> </tr>\r
+ <tr>  <td>French Polynesia</td>  <td>61</td>  <td>269</td>  <td>289</td>  <td>318</td>  <td>354</td> </tr>\r
+ <tr>  <td>Gabon</td>  <td>469</td>  <td>1475</td>  <td>1639</td>  <td>1915</td>  <td>2471</td> </tr>\r
+ <tr>  <td>Gambia</td>  <td>258</td>  <td>1705</td>  <td>1985</td>  <td>2478</td>  <td>3763</td> </tr>\r
+ <tr>  <td>Georgia</td>  <td>3527</td>  <td>4260</td>  <td>4084</td>  <td>3888</td>  <td>3267</td> </tr>\r
+ <tr>  <td>Germany</td>  <td>68376</td>  <td>82167</td>  <td>81346</td>  <td>79258</td>  <td>70504</td> </tr>\r
+ <tr>  <td>Ghana</td>  <td>4981</td>  <td>23837</td>  <td>26925</td>  <td>32233</td>  <td>45213</td> </tr>\r
+ <tr>  <td>Gibraltar</td>  <td>20</td>  <td>31</td>  <td>31</td>  <td>32</td>  <td>30</td> </tr>\r
+ <tr>  <td>Greece</td>  <td>7566</td>  <td>11161</td>  <td>11261</td>  <td>11274</td>  <td>10939</td> </tr>\r
+ <tr>  <td>Greenland</td>  <td>23</td>  <td>57</td>  <td>57</td>  <td>56</td>  <td>50</td> </tr>\r
+ <tr>  <td>Grenada</td>  <td>77</td>  <td>104</td>  <td>107</td>  <td>109</td>  <td>97</td> </tr>\r
+ <tr>  <td>Guadeloupe</td>  <td>210</td>  <td>465</td>  <td>476</td>  <td>489</td>  <td>477</td> </tr>\r
+ <tr>  <td>Guam</td>  <td>60</td>  <td>178</td>  <td>191</td>  <td>211</td>  <td>242</td> </tr>\r
+ <tr>  <td>Guatemala</td>  <td>3146</td>  <td>14027</td>  <td>16227</td>  <td>19927</td>  <td>27480</td> </tr>\r
+ <tr>  <td>Guinea</td>  <td>2619</td>  <td>10069</td>  <td>11844</td>  <td>15158</td>  <td>23975</td> </tr>\r
+ <tr>  <td>Guinea-Bissau</td>  <td>518</td>  <td>1611</td>  <td>1848</td>  <td>2296</td>  <td>3555</td> </tr>\r
+ <tr>  <td>Guyana</td>  <td>423</td>  <td>762</td>  <td>754</td>  <td>732</td>  <td>558</td> </tr>\r
+ <tr>  <td>Haiti</td>  <td>3221</td>  <td>10033</td>  <td>10957</td>  <td>12476</td>  <td>15485</td> </tr>\r
+ <tr>  <td>Holy See</td>  <td>1</td>  <td>1</td>  <td>1</td>  <td>1</td>  <td>1</td> </tr>\r
+ <tr>  <td>Honduras</td>  <td>1487</td>  <td>7466</td>  <td>8386</td>  <td>9844</td>  <td>12402</td> </tr>\r
+ <tr>  <td>Hungary</td>  <td>9338</td>  <td>9993</td>  <td>9874</td>  <td>9647</td>  <td>8934</td> </tr>\r
+ <tr>  <td>Iceland</td>  <td>143</td>  <td>323</td>  <td>353</td>  <td>384</td>  <td>407</td> </tr>\r
+ <tr>  <td>India</td>  <td>371857</td>  <td>1198003</td>  <td>1294192</td>  <td>1431272</td>  <td>1613800</td> </tr>\r
+ <tr>  <td>Indonesia</td>  <td>77152</td>  <td>229965</td>  <td>244191</td>  <td>263287</td>  <td>288110</td> </tr>\r
+ <tr>  <td>Iran (Islamic Republic of)</td>  <td>16913</td>  <td>74196</td>  <td>79454</td>  <td>87134</td>  <td>96975</td> </tr>\r
+ <tr>  <td>Iraq</td>  <td>5719</td>  <td>30747</td>  <td>35884</td>  <td>44692</td>  <td>63995</td> </tr>\r
+ <tr>  <td>Ireland</td>  <td>2969</td>  <td>4515</td>  <td>4886</td>  <td>5370</td>  <td>6295</td> </tr>\r
+ <tr>  <td>Isle of Man</td>  <td>55</td>  <td>80</td>  <td>81</td>  <td>80</td>  <td>75</td> </tr>\r
+ <tr>  <td>Israel</td>  <td>1258</td>  <td>7170</td>  <td>7823</td>  <td>8769</td>  <td>10649</td> </tr>\r
+ <tr>  <td>Italy</td>  <td>46367</td>  <td>59870</td>  <td>60604</td>  <td>60018</td>  <td>57066</td> </tr>\r
+ <tr>  <td>Jamaica</td>  <td>1403</td>  <td>2719</td>  <td>2786</td>  <td>2866</td>  <td>2683</td> </tr>\r
+ <tr>  <td>Japan</td>  <td>82824</td>  <td>127156</td>  <td>125791</td>  <td>120793</td>  <td>101659</td> </tr>\r
+ <tr>  <td>Jordan</td>  <td>472</td>  <td>6316</td>  <td>6957</td>  <td>8088</td>  <td>10241</td> </tr>\r
+ <tr>  <td>Kazakhstan</td>  <td>6703</td>  <td>15637</td>  <td>16289</td>  <td>17025</td>  <td>17848</td> </tr>\r
+ <tr>  <td>Kenya</td>  <td>6077</td>  <td>39802</td>  <td>46433</td>  <td>57573</td>  <td>85410</td> </tr>\r
+ <tr>  <td>Kiribati</td>  <td>26</td>  <td>98</td>  <td>107</td>  <td>123</td>  <td>151</td> </tr>\r
+ <tr>  <td>Kuwait</td>  <td>152</td>  <td>2985</td>  <td>3378</td>  <td>3988</td>  <td>5240</td> </tr>\r
+ <tr>  <td>Kyrgyzstan</td>  <td>1740</td>  <td>5482</td>  <td>5877</td>  <td>6378</td>  <td>6882</td> </tr>\r
+ <tr>  <td>Lao People's Dem. Republic</td>  <td>1666</td>  <td>6320</td>  <td>7028</td>  <td>8273</td>  <td>10744</td> </tr>\r
+ <tr>  <td>Latvia</td>  <td>1949</td>  <td>2249</td>  <td>2197</td>  <td>2101</td>  <td>1854</td> </tr>\r
+ <tr>  <td>Lebanon</td>  <td>1443</td>  <td>4224</td>  <td>4426</td>  <td>4736</td>  <td>5033</td> </tr>\r
+ <tr>  <td>Lesotho</td>  <td>734</td>  <td>2067</td>  <td>2168</td>  <td>2306</td>  <td>2491</td> </tr>\r
+ <tr>  <td>Liberia</td>  <td>824</td>  <td>3955</td>  <td>4665</td>  <td>5858</td>  <td>8841</td> </tr>\r
+ <tr>  <td>Libyan Arab Jamahiriya</td>  <td>1029</td>  <td>6420</td>  <td>7158</td>  <td>8144</td>  <td>9819</td> </tr>\r
+ <tr>  <td>Liechtenstein</td>  <td>14</td>  <td>36</td>  <td>38</td>  <td>40</td>  <td>45</td> </tr>\r
+ <tr>  <td>Lithuania</td>  <td>2567</td>  <td>3287</td>  <td>3143</td>  <td>2985</td>  <td>2579</td> </tr>\r
+ <tr>  <td>Luxembourg</td>  <td>296</td>  <td>486</td>  <td>520</td>  <td>582</td>  <td>733</td> </tr>\r
+ <tr>  <td>Madagascar</td>  <td>4084</td>  <td>19625</td>  <td>22853</td>  <td>28595</td>  <td>42693</td> </tr>\r
+ <tr>  <td>Malawi</td>  <td>2881</td>  <td>15263</td>  <td>17998</td>  <td>23194</td>  <td>36575</td> </tr>\r
+ <tr>  <td>Malaysia</td>  <td>6110</td>  <td>27468</td>  <td>30041</td>  <td>33770</td>  <td>39664</td> </tr>\r
+ <tr>  <td>Maldives</td>  <td>82</td>  <td>309</td>  <td>338</td>  <td>384</td>  <td>455</td> </tr>\r
+ <tr>  <td>Mali</td>  <td>4268</td>  <td>13010</td>  <td>14993</td>  <td>18603</td>  <td>28260</td> </tr>\r
+ <tr>  <td>Malta</td>  <td>312</td>  <td>409</td>  <td>417</td>  <td>426</td>  <td>413</td> </tr>\r
+ <tr>  <td>Marshall Islands</td>  <td>13</td>  <td>62</td>  <td>70</td>  <td>79</td>  <td>92</td> </tr>\r
+ <tr>  <td>Martinique</td>  <td>222</td>  <td>405</td>  <td>411</td>  <td>418</td>  <td>393</td> </tr>\r
+ <tr>  <td>Mauritania</td>  <td>651</td>  <td>3291</td>  <td>3732</td>  <td>4443</td>  <td>6061</td> </tr>\r
+ <tr>  <td>Mauritius</td>  <td>493</td>  <td>1288</td>  <td>1337</td>  <td>1400</td>  <td>1426</td> </tr>\r
+ <tr>  <td>Mayotte</td>  <td>15</td>  <td>194</td>  <td>224</td>  <td>277</td>  <td>386</td> </tr>\r
+ <tr>  <td>Mexico</td>  <td>27741</td>  <td>109610</td>  <td>115528</td>  <td>123366</td>  <td>128964</td> </tr>\r
+ <tr>  <td>Micronesia (Fed. States of)</td>  <td>32</td>  <td>111</td>  <td>114</td>  <td>122</td>  <td>128</td> </tr>\r
+ <tr>  <td>Moldova (Republic of)</td>  <td>2341</td>  <td>3604</td>  <td>3462</td>  <td>3291</td>  <td>2734</td> </tr>\r
+ <tr>  <td>Monaco</td>  <td>20</td>  <td>33</td>  <td>33</td>  <td>35</td>  <td>38</td> </tr>\r
+ <tr>  <td>Mongolia</td>  <td>761</td>  <td>2671</td>  <td>2855</td>  <td>3134</td>  <td>3446</td> </tr>\r
+ <tr>  <td>Montenegro</td>  <td>399</td>  <td>624</td>  <td>627</td>  <td>633</td>  <td>618</td> </tr>\r
+ <tr>  <td>Montserrat</td>  <td>14</td>  <td>6</td>  <td>6</td>  <td>7</td>  <td>7</td> </tr>\r
+ <tr>  <td>Morocco</td>  <td>8953</td>  <td>31993</td>  <td>34330</td>  <td>37865</td>  <td>42583</td> </tr>\r
+ <tr>  <td>Mozambique</td>  <td>6442</td>  <td>22894</td>  <td>25957</td>  <td>31190</td>  <td>44148</td> </tr>\r
+ <tr>  <td>Myanmar</td>  <td>17158</td>  <td>50020</td>  <td>53087</td>  <td>57585</td>  <td>63373</td> </tr>\r
+ <tr>  <td>Namibia</td>  <td>485</td>  <td>2171</td>  <td>2412</td>  <td>2810</td>  <td>3588</td> </tr>\r
+ <tr>  <td>Nauru</td>  <td>3</td>  <td>10</td>  <td>11</td>  <td>11</td>  <td>11</td> </tr>\r
+ <tr>  <td>Nepal</td>  <td>8126</td>  <td>29331</td>  <td>32503</td>  <td>38031</td>  <td>49028</td> </tr>\r
+ <tr>  <td>Netherlands</td>  <td>10114</td>  <td>16592</td>  <td>16915</td>  <td>17348</td>  <td>17399</td> </tr>\r
+ <tr>  <td>Netherlands Antilles</td>  <td>112</td>  <td>198</td>  <td>207</td>  <td>210</td>  <td>192</td> </tr>\r
+ <tr>  <td>New Caledonia</td>  <td>65</td>  <td>250</td>  <td>271</td>  <td>304</td>  <td>362</td> </tr>\r
+ <tr>  <td>New Zealand</td>  <td>1908</td>  <td>4266</td>  <td>4492</td>  <td>4831</td>  <td>5349</td> </tr>\r
+ <tr>  <td>Nicaragua</td>  <td>1295</td>  <td>5743</td>  <td>6265</td>  <td>7058</td>  <td>8143</td> </tr>\r
+ <tr>  <td>Niger</td>  <td>2462</td>  <td>15290</td>  <td>19150</td>  <td>27388</td>  <td>58216</td> </tr>\r
+ <tr>  <td>Nigeria</td>  <td>36680</td>  <td>154729</td>  <td>175928</td>  <td>210057</td>  <td>289083</td> </tr>\r
+ <tr>  <td>Niue</td>  <td>5</td>  <td>1</td>  <td>1</td>  <td>1</td>  <td>1</td> </tr>\r
+ <tr>  <td>Northern Mariana Islands</td>  <td>7</td>  <td>87</td>  <td>96</td>  <td>111</td>  <td>151</td> </tr>\r
+ <tr>  <td>Norway</td>  <td>3265</td>  <td>4812</td>  <td>5036</td>  <td>5365</td>  <td>5947</td> </tr>\r
+ <tr>  <td>Occupied Palestinian Territory</td>  <td>1005</td>  <td>4277</td>  <td>5090</td>  <td>6553</td>  <td>10265</td> </tr>\r
+ <tr>  <td>Oman</td>  <td>456</td>  <td>2845</td>  <td>3198</td>  <td>3782</td>  <td>4878</td> </tr>\r
+ <tr>  <td>Pakistan</td>  <td>41177</td>  <td>180808</td>  <td>205504</td>  <td>246286</td>  <td>335195</td> </tr>\r
+ <tr>  <td>Palau</td>  <td>7</td>  <td>20</td>  <td>21</td>  <td>23</td>  <td>26</td> </tr>\r
+ <tr>  <td>Panama</td>  <td>860</td>  <td>3454</td>  <td>3773</td>  <td>4267</td>  <td>5092</td> </tr>\r
+ <tr>  <td>Papua New Guinea</td>  <td>1798</td>  <td>6732</td>  <td>7678</td>  <td>9265</td>  <td>12871</td> </tr>\r
+ <tr>  <td>Paraguay</td>  <td>1473</td>  <td>6349</td>  <td>7007</td>  <td>8026</td>  <td>9867</td> </tr>\r
+ <tr>  <td>Peru</td>  <td>7632</td>  <td>29165</td>  <td>31197</td>  <td>34528</td>  <td>39776</td> </tr>\r
+ <tr>  <td>Philippines</td>  <td>19996</td>  <td>91983</td>  <td>101734</td>  <td>117270</td>  <td>146156</td> </tr>\r
+ <tr>  <td>Pitcairn</td>  <td>0</td>  <td>0</td>  <td>0</td>  <td>0</td>  <td>0</td> </tr>\r
+ <tr>  <td>Poland</td>  <td>24824</td>  <td>38074</td>  <td>37788</td>  <td>36964</td>  <td>32013</td> </tr>\r
+ <tr>  <td>Portugal</td>  <td>8405</td>  <td>10707</td>  <td>10787</td>  <td>10706</td>  <td>10015</td> </tr>\r
+ <tr>  <td>Puerto Rico</td>  <td>2218</td>  <td>3982</td>  <td>4074</td>  <td>4176</td>  <td>4103</td> </tr>\r
+ <tr>  <td>Qatar</td>  <td>25</td>  <td>1409</td>  <td>1630</td>  <td>1848</td>  <td>2316</td> </tr>\r
+ <tr>  <td>Republic of Korea</td>  <td>19211</td>  <td>48333</td>  <td>49153</td>  <td>49484</td>  <td>44077</td> </tr>\r
+ <tr>  <td>Réunion</td>  <td>248</td>  <td>827</td>  <td>886</td>  <td>973</td>  <td>1096</td> </tr>\r
+ <tr>  <td>Romania</td>  <td>16311</td>  <td>21275</td>  <td>20787</td>  <td>19961</td>  <td>17279</td> </tr>\r
+ <tr>  <td>Russian Federation</td>  <td>102702</td>  <td>140874</td>  <td>137983</td>  <td>132345</td>  <td>116097</td> </tr>\r
+ <tr>  <td>Rwanda</td>  <td>2162</td>  <td>9998</td>  <td>11743</td>  <td>14676</td>  <td>22082</td> </tr>\r
+ <tr>  <td>Saint Helena</td>  <td>5</td>  <td>4</td>  <td>4</td>  <td>5</td>  <td>5</td> </tr>\r
+ <tr>  <td>Saint Kitts and Nevis</td>  <td>46</td>  <td>52</td>  <td>56</td>  <td>61</td>  <td>69</td> </tr>\r
+ <tr>  <td>Saint Lucia</td>  <td>83</td>  <td>172</td>  <td>182</td>  <td>198</td>  <td>217</td> </tr>\r
+ <tr>  <td>Saint Pierre and Miquelon</td>  <td>5</td>  <td>6</td>  <td>6</td>  <td>6</td>  <td>6</td> </tr>\r
+ <tr>  <td>St. Vincent and the Grenadines</td>  <td>67</td>  <td>109</td>  <td>110</td>  <td>111</td>  <td>119</td> </tr>\r
+ <tr>  <td>Samoa</td>  <td>82</td>  <td>179</td>  <td>181</td>  <td>188</td>  <td>192</td> </tr>\r
+ <tr>  <td>San Marino</td>  <td>13</td>  <td>31</td>  <td>32</td>  <td>33</td>  <td>33</td> </tr>\r
+ <tr>  <td>Sao Tome and Principe</td>  <td>60</td>  <td>163</td>  <td>180</td>  <td>216</td>  <td>296</td> </tr>\r
+ <tr>  <td>Saudi Arabia</td>  <td>3201</td>  <td>25721</td>  <td>28933</td>  <td>34176</td>  <td>43658</td> </tr>\r
+ <tr>  <td>Senegal</td>  <td>2416</td>  <td>12534</td>  <td>14526</td>  <td>17861</td>  <td>26102</td> </tr>\r
+ <tr>  <td>Serbia</td>  <td>6732</td>  <td>9850</td>  <td>9828</td>  <td>9720</td>  <td>9193</td> </tr>\r
+ <tr>  <td>Seychelles</td>  <td>36</td>  <td>84</td>  <td>86</td>  <td>91</td>  <td>97</td> </tr>\r
+ <tr>  <td>Sierra Leone</td>  <td>1944</td>  <td>5696</td>  <td>6557</td>  <td>8112</td>  <td>12446</td> </tr>\r
+ <tr>  <td>Singapore</td>  <td>1022</td>  <td>4737</td>  <td>5059</td>  <td>5362</td>  <td>5221</td> </tr>\r
+ <tr>  <td>Slovakia</td>  <td>3463</td>  <td>5406</td>  <td>5437</td>  <td>5413</td>  <td>4917</td> </tr>\r
+ <tr>  <td>Slovenia</td>  <td>1473</td>  <td>2020</td>  <td>2044</td>  <td>2050</td>  <td>1954</td> </tr>\r
+ <tr>  <td>Solomon Islands</td>  <td>90</td>  <td>523</td>  <td>599</td>  <td>725</td>  <td>1007</td> </tr>\r
+ <tr>  <td>Somalia</td>  <td>2264</td>  <td>9133</td>  <td>10731</td>  <td>13922</td>  <td>23522</td> </tr>\r
+ <tr>  <td>South Africa</td>  <td>13683</td>  <td>50110</td>  <td>51684</td>  <td>53766</td>  <td>56802</td> </tr>\r
+ <tr>  <td>Spain</td>  <td>28009</td>  <td>44904</td>  <td>47203</td>  <td>49265</td>  <td>51260</td> </tr>\r
+ <tr>  <td>Sri Lanka</td>  <td>8241</td>  <td>20238</td>  <td>21167</td>  <td>22033</td>  <td>21705</td> </tr>\r
+ <tr>  <td>Sudan</td>  <td>9190</td>  <td>42272</td>  <td>47730</td>  <td>56688</td>  <td>75884</td> </tr>\r
+ <tr>  <td>Suriname</td>  <td>215</td>  <td>520</td>  <td>547</td>  <td>586</td>  <td>619</td> </tr>\r
+ <tr>  <td>Swaziland</td>  <td>273</td>  <td>1185</td>  <td>1287</td>  <td>1455</td>  <td>1749</td> </tr>\r
+ <tr>  <td>Sweden</td>  <td>7014</td>  <td>9249</td>  <td>9498</td>  <td>9915</td>  <td>10571</td> </tr>\r
+ <tr>  <td>Switzerland</td>  <td>4693</td>  <td>7568</td>  <td>7736</td>  <td>8020</td>  <td>8514</td> </tr>\r
+ <tr>  <td>Syrian Arab Republic</td>  <td>3536</td>  <td>21906</td>  <td>24494</td>  <td>28592</td>  <td>36911</td> </tr>\r
+ <tr>  <td>Tajikistan</td>  <td>1532</td>  <td>6952</td>  <td>7761</td>  <td>9075</td>  <td>11111</td> </tr>\r
+ <tr>  <td>TFYR Macedonia</td>  <td>1230</td>  <td>2042</td>  <td>2045</td>  <td>2037</td>  <td>1857</td> </tr>\r
+ <tr>  <td>Thailand</td>  <td>20607</td>  <td>67764</td>  <td>69939</td>  <td>72628</td>  <td>73361</td> </tr>\r
+ <tr>  <td>Timor-Leste</td>  <td>433</td>  <td>1134</td>  <td>1385</td>  <td>1869</td>  <td>3217</td> </tr>\r
+ <tr>  <td>Togo</td>  <td>1329</td>  <td>6619</td>  <td>7607</td>  <td>9282</td>  <td>13196</td> </tr>\r
+ <tr>  <td>Tokelau</td>  <td>2</td>  <td>1</td>  <td>1</td>  <td>1</td>  <td>1</td> </tr>\r
+ <tr>  <td>Tonga</td>  <td>47</td>  <td>104</td>  <td>105</td>  <td>112</td>  <td>123</td> </tr>\r
+ <tr>  <td>Trinidad and Tobago</td>  <td>636</td>  <td>1339</td>  <td>1368</td>  <td>1388</td>  <td>1278</td> </tr>\r
+ <tr>  <td>Tunisia</td>  <td>3530</td>  <td>10272</td>  <td>10884</td>  <td>11797</td>  <td>12711</td> </tr>\r
+ <tr>  <td>Turkey</td>  <td>21484</td>  <td>74816</td>  <td>79966</td>  <td>87364</td>  <td>97389</td> </tr>\r
+ <tr>  <td>Turkmenistan</td>  <td>1211</td>  <td>5110</td>  <td>5509</td>  <td>6072</td>  <td>6796</td> </tr>\r
+ <tr>  <td>Turks and Caicos Islands</td>  <td>5</td>  <td>33</td>  <td>35</td>  <td>38</td>  <td>40</td> </tr>\r
+ <tr>  <td>Tuvalu</td>  <td>5</td>  <td>10</td>  <td>10</td>  <td>11</td>  <td>11</td> </tr>\r
+ <tr>  <td>Uganda</td>  <td>5158</td>  <td>32710</td>  <td>39710</td>  <td>53406</td>  <td>91271</td> </tr>\r
+ <tr>  <td>Ukraine</td>  <td>37298</td>  <td>45708</td>  <td>44165</td>  <td>41617</td>  <td>35026</td> </tr>\r
+ <tr>  <td>United Arab Emirates</td>  <td>70</td>  <td>4599</td>  <td>5193</td>  <td>6109</td>  <td>8253</td> </tr>\r
+ <tr>  <td>United Kingdom</td>  <td>50616</td>  <td>61565</td>  <td>63528</td>  <td>66601</td>  <td>72365</td> </tr>\r
+ <tr>  <td>United Republic of Tanzania</td>  <td>7650</td>  <td>43739</td>  <td>52109</td>  <td>67394</td>  <td>109450</td> </tr>\r
+ <tr>  <td>United States of America</td>  <td>157813</td>  <td>314659</td>  <td>332334</td>  <td>358735</td>  <td>403932</td> </tr>\r
+ <tr>  <td>United States Virgin Islands</td>  <td>27</td>  <td>110</td>  <td>108</td>  <td>103</td>  <td>75</td> </tr>\r
+ <tr>  <td>Uruguay</td>  <td>2239</td>  <td>3361</td>  <td>3430</td>  <td>3546</td>  <td>3637</td> </tr>\r
+ <tr>  <td>Uzbekistan</td>  <td>6314</td>  <td>27488</td>  <td>29456</td>  <td>32715</td>  <td>36439</td> </tr>\r
+ <tr>  <td>Vanuatu</td>  <td>48</td>  <td>240</td>  <td>276</td>  <td>338</td>  <td>482</td> </tr>\r
+ <tr>  <td>Venezuela (Bolivarian Republic of)</td>  <td>5094</td>  <td>28583</td>  <td>31292</td>  <td>35370</td>  <td>42042</td> </tr>\r
+ <tr>  <td>Viet Nam</td>  <td>27367</td>  <td>88069</td>  <td>93647</td>  <td>102054</td>  <td>111666</td> </tr>\r
+ <tr>  <td>Wallis and Futuna Islands</td>  <td>7</td>  <td>15</td>  <td>16</td>  <td>17</td>  <td>17</td> </tr>\r
+ <tr>  <td>Western Sahara</td>  <td>14</td>  <td>513</td>  <td>625</td>  <td>775</td>  <td>938</td> </tr>\r
+ <tr>  <td>Yemen</td>  <td>4316</td>  <td>23580</td>  <td>27819</td>  <td>35509</td>  <td>53689</td> </tr>\r
+ <tr>  <td>Zambia</td>  <td>2340</td>  <td>12935</td>  <td>14980</td>  <td>18890</td>  <td>28957</td> </tr>\r
+ <tr>  <td>Zimbabwe</td>  <td>2747</td>  <td>12523</td>  <td>14029</td>  <td>16780</td>  <td>22178</td> </tr>\r
  </tbody>\r
  </table>\r
  \r
-<p style='font-size:smaller;'>Data source: <a href="http://www.un.org/esa/population/unpop.htm">Population Division of the \r
-Department of Economic and Social Affairs of the United Nations Secretariat</a> (2009). \r
-<em>World Population Prospects: The 2008 Revision. Highlights.</em> New York: United Nations.  </p>                            \r
+<p style='font-size:smaller;'>Data source: <a href="http://www.un.org/esa/population/unpop.htm">Population Division of the\r
+Department of Economic and Social Affairs of the United Nations Secretariat</a> (2009).\r
+<em>World Population Prospects: The 2008 Revision. Highlights.</em> New York: United Nations.  </p>\r
  \r
  \r
  <p>&nbsp;</p>\r
@@ -2045,9 +421,9 @@ Department of Economic and Social Affairs of the United Nations Secretariat</a>
  \r
  <p><button onclick='openWindow(this)'>Open Dialog Window</button>\r
  <div id='dialog' title='The Gettysburg Address'>\r
-<p>Four score and seven years ago our fathers brought forth on this continent, a new nation, conceived in Liberty, and dedicated to the proposition that all men are created equal. \r
-<p>Now we are engaged in a great civil war, testing whether that nation, or any nation so conceived and so dedicated, can long endure. We are met on a great battle-field of that war. We have come to dedicate a portion of that field, as a final resting place for those who here gave their lives that that nation might live. It is altogether fitting and proper that we should do this. \r
-<p>But, in a larger sense, we can not dedicate -- we can not consecrate -- we can not hallow -- this ground. The brave men, living and dead, who struggled here, have consecrated it, far above our poor power to add or detract. The world will little note, nor long remember what we say here, but it can never forget what they did here. It is for us the living, rather, to be dedicated here to the unfinished work which they who fought here have thus far so nobly advanced. It is rather for us to be here dedicated to the great task remaining before us -- that from these honored dead we take increased devotion to that cause for which they gave the last full measure of devotion -- that we here highly resolve that these dead shall not have died in vain -- that this nation, under God, shall have a new birth of freedom -- and that government of the people, by the people, for the people, shall not perish from the earth. \r
+<p>Four score and seven years ago our fathers brought forth on this continent, a new nation, conceived in Liberty, and dedicated to the proposition that all men are created equal.\r
+<p>Now we are engaged in a great civil war, testing whether that nation, or any nation so conceived and so dedicated, can long endure. We are met on a great battle-field of that war. We have come to dedicate a portion of that field, as a final resting place for those who here gave their lives that that nation might live. It is altogether fitting and proper that we should do this.\r
+<p>But, in a larger sense, we can not dedicate -- we can not consecrate -- we can not hallow -- this ground. The brave men, living and dead, who struggled here, have consecrated it, far above our poor power to add or detract. The world will little note, nor long remember what we say here, but it can never forget what they did here. It is for us the living, rather, to be dedicated here to the unfinished work which they who fought here have thus far so nobly advanced. It is rather for us to be here dedicated to the great task remaining before us -- that from these honored dead we take increased devotion to that cause for which they gave the last full measure of devotion -- that we here highly resolve that these dead shall not have died in vain -- that this nation, under God, shall have a new birth of freedom -- and that government of the people, by the people, for the people, shall not perish from the earth.\r
  </div>\r
  \r
  <p>&nbsp;</p>\r
diff --git a/minsrc/ricoGridCommon.js b/minsrc/ricoGridCommon.js

index 7bc1dce..e790692 100644 (file)
--- a/minsrc/ricoGridCommon.js
+++ b/minsrc/ricoGridCommon.js
@@ -229,12 +229,19 @@ Rico.GridCommon = {
        tr1.vAlign='top';
        this.structTabLeft=tr1.insertCell(-1);
        this.structTabLeft.rowSpan=2;
+      this.structTabLeft.style.padding='0px';
+      this.structTabLeft.style.border='none';
        var tr2=this.structTab.insertRow(-1);
        tr2.vAlign='top';
        this.structTabUR=tr1.insertCell(-1);
+      this.structTabUR.style.padding='0px';
+      this.structTabUR.style.border='none';
        this.structTabLR=tr2.insertCell(-1);
+      this.structTabLR.style.padding='0px';
+      this.structTabLR.style.border='none';
        this.outerDiv.appendChild(this.structTab);
      }
+    Rico.addClass(this.structTab,'ricoLG_StructTab');
      //this.structTabLR.style.overflow='hidden';
      //if (Rico.isOpera) this.outerDiv.style.overflow="hidden";
      this.frozenTabs = this.createDiv("frozenTabs",this.structTabLeft);
diff --git a/minsrc/ricoLiveGrid.js b/minsrc/ricoLiveGrid.js

index 93d1b9d..6a5ef63 100644 (file)
--- a/minsrc/ricoLiveGrid.js
+++ b/minsrc/ricoLiveGrid.js
@@ -390,32 +390,32 @@ Rico.Buffer.Base.prototype = {
      this.rowcntContent = this.size = this.rows.length;
    },
  
-  printAll: function(exportType) {
+  printAll: function() {
      this.liveGrid.showMsg(Rico.getPhraseById('exportInProgress'));
-    Rico.runLater(10,this,'_printAll',exportType);  // allow message to paint
+    Rico.runLater(10,this,'_printAll');  // allow message to paint
    },
  
  /**
   * Support function for printAll()
   */
-  _printAll: function(exportType) {
+  _printAll: function() {
      this.liveGrid.exportStart();
      this.exportBuffer(this.getRows(0,this.totalRows));
-    this.liveGrid.exportFinish(exportType);
+    this.liveGrid.exportFinish();
    },
  
  /**
   * Copies visible rows to a new window as a simple html table.
   */
-  printVisible: function(exportType) {
+  printVisible: function() {
      this.liveGrid.showMsg(Rico.getPhraseById('exportInProgress'));
-    Rico.runLater(10,this,'_printVisible',exportType);  // allow message to paint
+    Rico.runLater(10,this,'_printVisible');  // allow message to paint
    },
  
-  _printVisible: function(exportType) {
+  _printVisible: function() {
      this.liveGrid.exportStart();
      this.exportBuffer(this.visibleRows());
-    this.liveGrid.exportFinish(exportType);
+    this.liveGrid.exportFinish();
    },
  
  /**
@@ -1054,7 +1054,7 @@ Rico.LiveGridMethods = {
    },
  
    remainingHt: function() {
-    var tabHt;
+    var tabHt=this.outerDiv.offsetHeight;
      var winHt=Rico.windowHeight();
      var margin=Rico.isIE ? 15 : 10;
      // if there is a horizontal scrollbar take it into account
@@ -1062,17 +1062,15 @@ Rico.LiveGridMethods = {
      switch (this.sizeTo) {
        case 'window':
          var divTop=Rico.cumulativeOffset(this.outerDiv).top;
-        tabHt=Math.max(this.tabs[0].offsetHeight,this.tabs[1].offsetHeight);
-        Rico.log("remainingHt, winHt="+winHt+' tabHt='+tabHt+' gridY='+divTop);
-        return winHt-divTop-tabHt-this.options.scrollBarWidth-margin;  // allow for scrollbar and some margin
+        Rico.log("remainingHt/window, winHt="+winHt+' tabHt='+tabHt+' gridY='+divTop);
+        return winHt-divTop-tabHt-margin;  // allow for scrollbar and some margin
        case 'parent':
          var offset=this.offsetFromParent(this.outerDiv);
-        tabHt=Math.max(this.tabs[0].offsetHeight,this.tabs[1].offsetHeight);
          if (Rico.isIE) Rico.hide(this.outerDiv);
-        var parentHt=this.outerDiv.parentNode.offsetHeight;
+        var parentHt=this.outerDiv.parentNode.clientHeight;
          if (Rico.isIE) Rico.show(this.outerDiv);
-        Rico.log("remainingHt, parentHt="+parentHt+' gridY='+offset+' winHt='+winHt+' tabHt='+tabHt);
-        return parentHt - tabHt - offset - this.options.scrollBarWidth;
+        Rico.log("remainingHt/parent, parentHt="+parentHt+' offset='+offset+' tabHt='+tabHt);
+        return parentHt-tabHt-offset-margin;
        case 'data':
        case 'body':
          var bodyHt=Rico.isIE ? document.body.scrollHeight : document.body.offsetHeight;
@@ -1082,11 +1080,10 @@ Rico.LiveGridMethods = {
          Rico.log("remainingHt, winHt="+winHt+' pageHt='+bodyHt+' remHt='+remHt);
          return remHt;
        default:
-        tabHt=Math.max(this.tabs[0].offsetHeight,this.tabs[1].offsetHeight);
          Rico.log("remainingHt, winHt="+winHt+' tabHt='+tabHt);
          if (this.sizeTo.slice(-1)=='%') winHt*=parseFloat(this.sizeTo)/100.0;
          else if (this.sizeTo.slice(-2)=='px') winHt=parseInt(this.sizeTo,10);
-        return winHt-tabHt-this.options.scrollBarWidth-margin;  // allow for scrollbar and some margin
+        return winHt-tabHt-margin;  // allow for scrollbar and some margin
      }
    },
  
@@ -1282,6 +1279,7 @@ Rico.LiveGridMethods = {
      }
      var self=this;
      this.menu.showmenu(e,function() { self.closeMenu(); });
+    return false;
    },
  
    closeMenu: function() {
@@ -1562,8 +1560,7 @@ Rico.LiveGridMethods = {
    },
  
    unhighlightCell: function(cell) {
-    if (cell==null) return;
-    Rico.removeClass(cell,this.options.highlightClass);
+    if (cell) Rico.removeClass(cell,this.options.highlightClass);
    },
  
    selectRow: function(r) {
diff --git a/minsrc/ricoLiveGridAjax.js b/minsrc/ricoLiveGridAjax.js

index cab820f..01b6921 100644 (file)
--- a/minsrc/ricoLiveGridAjax.js
+++ b/minsrc/ricoLiveGridAjax.js
@@ -555,15 +555,15 @@ Rico.Buffer.AjaxSQLMethods = {
    },
  
    // for datasource that is a javascript function
-  _printAll: function(exportType) {
+  _printAll: function() {
      this.liveGrid.exportStart();
      this.ajaxOptions.parameters = this.formQueryHashSQL(0,this.liveGrid.options.maxPrint);
      var self=this;
-    this.ajaxOptions.onComplete = function() { self._jsExport(exportType); };
+    this.ajaxOptions.onComplete = function() { self._jsExport(); };
      this.dataSource(this.ajaxOptions);
    },
  
-  _jsExport: function(exportType, newRows, newAttr, totalRows, errMsg) {
+  _jsExport: function(newRows, newAttr, totalRows, errMsg) {
      Rico.log("_jsExport: "+arguments.length);
      if (errMsg) {
        Rico.log("_jsExport: received error="+errMsg);
@@ -571,7 +571,7 @@ Rico.Buffer.AjaxSQLMethods = {
        return;
      }
      this.exportBuffer(newRows,0);
-    this.liveGrid.exportFinish(exportType);
+    this.liveGrid.exportFinish();
    }
  
  };
diff --git a/minsrc/ricoLiveGridMenu.js b/minsrc/ricoLiveGridMenu.js

index bb85181..e778536 100644 (file)
--- a/minsrc/ricoLiveGridMenu.js
+++ b/minsrc/ricoLiveGridMenu.js
@@ -106,13 +106,8 @@ buildGridMenu: function(r,c) {
    } else if (maxprint > 0 && totrows>0) {
      // any other buffer
      this.addSubMenuItem(Rico.getPhraseById('gridmenuExport'),this.exportmenu,false);
-    this.exportmenu.addMenuItemId("gridmenuExportVis2Web", function() { buffer.printVisible('plain'); });
-    this.exportmenu.addMenuItemId("gridmenuExportAll2Web", function() { buffer.printAll('plain'); }, buffer.totalRows <= maxprint);
-    if (Rico.isIE) {
-      this.exportmenu.addMenuBreak();
-      this.exportmenu.addMenuItemId("gridmenuExportVis2SS", function() { buffer.printVisible('owc'); });
-      this.exportmenu.addMenuItemId("gridmenuExportAll2SS", function() { buffer.printAll('owc'); }, buffer.totalRows <= maxprint);
-    }
+    this.exportmenu.addMenuItemId("gridmenuExportVis2Web", function() { buffer.printVisible(); });
+    this.exportmenu.addMenuItemId("gridmenuExportAll2Web", function() { buffer.printAll(); }, buffer.totalRows <= maxprint);
    }
  
    // menu items for hide/unhide
diff --git a/minsrc/ricoSimpleGrid.js b/minsrc/ricoSimpleGrid.js

index 170c942..e5462b8 100644 (file)
--- a/minsrc/ricoSimpleGrid.js
+++ b/minsrc/ricoSimpleGrid.js
@@ -219,12 +219,12 @@ Rico.SimpleGrid.prototype = {
  /**
   * Copies all rows to a new window as a simple html table.
   */
-  printVisible: function(exportType) {
+  printVisible: function() {
      this.showMsg(Rico.getPhraseById('exportInProgress'));
-    Rico.runLater(10,this,'_printVisible',exportType);  // allow message to paint
+    Rico.runLater(10,this,'_printVisible');  // allow message to paint
    },
  
-  _printVisible: function(exportType) {
+  _printVisible: function() {
      this.exportStart();
      var exportStyles=this.getExportStyles(this.tbody[0]);
      for(var r=0; r < this.pageSize; r++) {
diff --git a/ricoClient/js/rico2doj.js b/ricoClient/js/rico2doj.js

index 5853a81..61a47a5 100644 (file)
--- a/ricoClient/js/rico2doj.js
+++ b/ricoClient/js/rico2doj.js
@@ -42,7 +42,16 @@ Rico.eventElement=function(ev) {
    return ev.target;
  };
  
-Rico.eventStop=dojo.stopEvent;
+// the Dojo native function has problems on IE
+Rico.eventStop=function(ev) {
+  if (window.attachEvent) {
+    window.event.returnValue = false;
+    window.event.cancelBubble = true;
+  } else {
+    ev.preventDefault();
+    ev.stopPropagation();
+  }
+};
  
  Rico.eventClient=function(ev) {
    return {x:ev.pageX, y:ev.pageY};
diff --git a/ricoClient/js/ricoThemeroller.js b/ricoClient/js/ricoThemeroller.js

index 2c745a5..aafde1f 100644 (file)
--- a/ricoClient/js/ricoThemeroller.js
+++ b/ricoClient/js/ricoThemeroller.js
@@ -16,7 +16,7 @@
  // Connects Rico to jQuery Themeroller css classes\r
  \r
   Rico.theme = {\r
-  widget: 'ui-widget',\r
+  //widget: 'ui-widget',  // causes display issues in 3grids example in FF4\r
    gridheader: 'ui-widget-header',\r
    gridcontent:'ui-widget-content',\r
    gridMessage:'ui-state-highlight ui-corner-all',\r
diff --git a/ricoClient/js/rico_min.js b/ricoClient/js/rico_min.js

index 01c756e..788ea0e 100644 (file)
--- a/ricoClient/js/rico_min.js
+++ b/ricoClient/js/rico_min.js
@@ -1661,12 +1661,19 @@ var b=this.structTab.insertRow(-1);
  b.vAlign="top";
  this.structTabLeft=b.insertCell(-1);
  this.structTabLeft.rowSpan=2;
+this.structTabLeft.style.padding="0px";
+this.structTabLeft.style.border="none";
  var d=this.structTab.insertRow(-1);
  d.vAlign="top";
  this.structTabUR=b.insertCell(-1);
+this.structTabUR.style.padding="0px";
+this.structTabUR.style.border="none";
  this.structTabLR=d.insertCell(-1);
+this.structTabLR.style.padding="0px";
+this.structTabLR.style.border="none";
  this.outerDiv.appendChild(this.structTab)
-}this.frozenTabs=this.createDiv("frozenTabs",this.structTabLeft);
+}Rico.addClass(this.structTab,"ricoLG_StructTab");
+this.frozenTabs=this.createDiv("frozenTabs",this.structTabLeft);
  this.innerDiv=this.createDiv("inner",this.structTabUR);
  this.scrollDiv=this.createDiv("scroll",this.structTabLR);
  this.resizeDiv=this.createDiv("resize",this.outerDiv,true);
@@ -2222,23 +2229,23 @@ this.innerDiv.style.width=(this.scrWi-this.options.scrollBarWidth+a)+"px";
  b+=a;
  this.resizeDiv.style.height=b+"px";
  this.handleScroll()
-},printVisible:function(a){this.showMsg(Rico.getPhraseById("exportInProgress"));
-Rico.runLater(10,this,"_printVisible",a)
-},_printVisible:function(a){this.exportStart();
-var g=this.getExportStyles(this.tbody[0]);
-for(var f=0;
-f<this.pageSize;
-f++){if(this.columns[0].cell(f).style.display=="none"){continue
-}var e="";
-for(var h=0;
-h<this.columns.length;
-h++){var d=this.columns[h];
-if(d.visible){var b=d.getFormattedValue(f,!this.options.exportImgTags,!this.options.exportFormFields,"NoExport");
-if(d.format.exportPrefix){b=d.format.exportPrefix+b
-}if(b==""){b="&nbsp;"
-}e+="<td style='"+this.exportStyle(d.cell(f),g)+"'>"+b+"</td>"
-}}this.exportRows.push(e)
-}this.exportFinish(a)
+},printVisible:function(){this.showMsg(Rico.getPhraseById("exportInProgress"));
+Rico.runLater(10,this,"_printVisible")
+},_printVisible:function(){this.exportStart();
+var f=this.getExportStyles(this.tbody[0]);
+for(var e=0;
+e<this.pageSize;
+e++){if(this.columns[0].cell(e).style.display=="none"){continue
+}var d="";
+for(var g=0;
+g<this.columns.length;
+g++){var b=this.columns[g];
+if(b.visible){var a=b.getFormattedValue(e,!this.options.exportImgTags,!this.options.exportFormFields,"NoExport");
+if(b.format.exportPrefix){a=b.format.exportPrefix+a
+}if(a==""){a="&nbsp;"
+}d+="<td style='"+this.exportStyle(b.cell(e),f)+"'>"+a+"</td>"
+}}this.exportRows.push(d)
+}this.exportFinish(exportType)
  },hideRow:function(a){if(this.columns[0].cell(a).style.display=="none"){return
  }for(var b=0;
  b<this.columns.length;
@@ -2540,16 +2547,16 @@ break
  }}if(f){g.push(this.baseRows[a])
  }}this.rows=g
  }this.rowcntContent=this.size=this.rows.length
-},printAll:function(a){this.liveGrid.showMsg(Rico.getPhraseById("exportInProgress"));
-Rico.runLater(10,this,"_printAll",a)
-},_printAll:function(a){this.liveGrid.exportStart();
+},printAll:function(){this.liveGrid.showMsg(Rico.getPhraseById("exportInProgress"));
+Rico.runLater(10,this,"_printAll")
+},_printAll:function(){this.liveGrid.exportStart();
  this.exportBuffer(this.getRows(0,this.totalRows));
-this.liveGrid.exportFinish(a)
-},printVisible:function(a){this.liveGrid.showMsg(Rico.getPhraseById("exportInProgress"));
-Rico.runLater(10,this,"_printVisible",a)
-},_printVisible:function(a){this.liveGrid.exportStart();
+this.liveGrid.exportFinish()
+},printVisible:function(){this.liveGrid.showMsg(Rico.getPhraseById("exportInProgress"));
+Rico.runLater(10,this,"_printVisible")
+},_printVisible:function(){this.liveGrid.exportStart();
  this.exportBuffer(this.visibleRows());
-this.liveGrid.exportFinish(a)
+this.liveGrid.exportFinish()
  },exportBuffer:function(l,f){var a,g,k,b,j;
  Rico.log("exportBuffer: "+l.length+" rows");
  var e=this.liveGrid.getExportStyles(this.liveGrid.tbody[0]);
@@ -2954,31 +2961,28 @@ this.setHorizontalScroll()
  },setHorizontalScroll:function(){var a=(-this.scrollDiv.scrollLeft)+"px";
  this.tabs[1].style.marginLeft=a;
  this.tabs[2].style.marginLeft=a
-},remainingHt:function(){var f;
+},remainingHt:function(){var f=this.outerDiv.offsetHeight;
  var g=Rico.windowHeight();
  var e=Rico.isIE?15:10;
  if(!Rico.isIE&&window.frameElement&&window.frameElement.scrolling=="yes"&&this.sizeTo!="parent"){e+=this.options.scrollBarWidth
  }switch(this.sizeTo){case"window":var d=Rico.cumulativeOffset(this.outerDiv).top;
-f=Math.max(this.tabs[0].offsetHeight,this.tabs[1].offsetHeight);
-Rico.log("remainingHt, winHt="+g+" tabHt="+f+" gridY="+d);
-return g-d-f-this.options.scrollBarWidth-e;
+Rico.log("remainingHt/window, winHt="+g+" tabHt="+f+" gridY="+d);
+return g-d-f-e;
  case"parent":var h=this.offsetFromParent(this.outerDiv);
-f=Math.max(this.tabs[0].offsetHeight,this.tabs[1].offsetHeight);
  if(Rico.isIE){Rico.hide(this.outerDiv)
-}var b=this.outerDiv.parentNode.offsetHeight;
+}var b=this.outerDiv.parentNode.clientHeight;
  if(Rico.isIE){Rico.show(this.outerDiv)
-}Rico.log("remainingHt, parentHt="+b+" gridY="+h+" winHt="+g+" tabHt="+f);
-return b-f-h-this.options.scrollBarWidth;
+}Rico.log("remainingHt/parent, parentHt="+b+" offset="+h+" tabHt="+f);
+return b-f-h-e;
  case"data":case"body":var a=Rico.isIE?document.body.scrollHeight:document.body.offsetHeight;
  var c=g-a-e;
  if(!Rico.isWebKit){c-=this.options.scrollBarWidth
  }Rico.log("remainingHt, winHt="+g+" pageHt="+a+" remHt="+c);
  return c;
-default:f=Math.max(this.tabs[0].offsetHeight,this.tabs[1].offsetHeight);
-Rico.log("remainingHt, winHt="+g+" tabHt="+f);
+default:Rico.log("remainingHt, winHt="+g+" tabHt="+f);
  if(this.sizeTo.slice(-1)=="%"){g*=parseFloat(this.sizeTo)/100
  }else{if(this.sizeTo.slice(-2)=="px"){g=parseInt(this.sizeTo,10)
-}}return g-f-this.options.scrollBarWidth-e
+}}return g-f-e
  }},offsetFromParent:function(b){var a=0;
  var c=b.parentNode;
  do{a+=b.offsetTop||0;
@@ -3089,7 +3093,8 @@ if(!d){return
  }}if(this.options.highlightElem=="selection"&&!this.isSelected(b.cell)){this.selectCell(b.cell)
  }var c=this;
  this.menu.showmenu(f,function(){c.closeMenu()
-})
+});
+return false
  },closeMenu:function(){if(!this.menuIdx){return
  }if(this.hideScroll){this.scrollDiv.style.overflow=""
  }this.highlightEnabled=true;
@@ -3252,9 +3257,8 @@ var d=Math.max(this.SelectIdxEnd.column,this.SelectIdxStart.column);
  var f=this.datasetIndex(a);
  return(c<=f.row&&f.row<=b&&e<=f.column&&f.column<=d)
  },highlightCell:function(a){Rico.addClass(a,this.options.highlightClass)
-},unhighlightCell:function(a){if(a==null){return
-}Rico.removeClass(a,this.options.highlightClass)
-},selectRow:function(a){for(var b=0;
+},unhighlightCell:function(a){if(a){Rico.removeClass(a,this.options.highlightClass)
+}},selectRow:function(a){for(var b=0;
  b<this.columns.length;
  b++){this.highlightCell(this.columns[b].cell(a))
  }},unselectRow:function(a){for(var b=0;
@@ -3922,16 +3926,11 @@ this.exportmenu.addMenuItemId("gridmenuExportVis2SS",function(){f.printVisibleSQ
  this.exportmenu.addMenuItemId("gridmenuExportAll2SS",function(){f.printAllSQL("xl")
  },f.totalRows<=n)
  }else{if(n>0&&m>0){this.addSubMenuItem(Rico.getPhraseById("gridmenuExport"),this.exportmenu,false);
-this.exportmenu.addMenuItemId("gridmenuExportVis2Web",function(){f.printVisible("plain")
-});
-this.exportmenu.addMenuItemId("gridmenuExportAll2Web",function(){f.printAll("plain")
-},f.totalRows<=n);
-if(Rico.isIE){this.exportmenu.addMenuBreak();
-this.exportmenu.addMenuItemId("gridmenuExportVis2SS",function(){f.printVisible("owc")
+this.exportmenu.addMenuItemId("gridmenuExportVis2Web",function(){f.printVisible()
  });
-this.exportmenu.addMenuItemId("gridmenuExportAll2SS",function(){f.printAll("owc")
+this.exportmenu.addMenuItemId("gridmenuExportAll2Web",function(){f.printAll()
  },f.totalRows<=n)
-}}}var k=o.listInvisible();
+}}var k=o.listInvisible();
  for(var e=0,j=0;
  j<k.length;
  j++){if(k[j].canHideShow()){e++
@@ -4254,18 +4253,18 @@ window.open(b,"",this.liveGrid.options.exportWindow)
  c.hidden=this.liveGrid.listInvisible("index").join(",");
  var b=this.dataSource+"?"+Rico.toQueryString(c);
  window.open(b,"",this.liveGrid.options.exportWindow)
-},_printAll:function(a){this.liveGrid.exportStart();
+},_printAll:function(){this.liveGrid.exportStart();
  this.ajaxOptions.parameters=this.formQueryHashSQL(0,this.liveGrid.options.maxPrint);
-var b=this;
-this.ajaxOptions.onComplete=function(){b._jsExport(a)
+var a=this;
+this.ajaxOptions.onComplete=function(){a._jsExport()
  };
  this.dataSource(this.ajaxOptions)
-},_jsExport:function(a,c,e,b,d){Rico.log("_jsExport: "+arguments.length);
-if(d){Rico.log("_jsExport: received error="+d);
-this.liveGrid.showMsg(Rico.getPhraseById("requestError",d));
+},_jsExport:function(b,d,a,c){Rico.log("_jsExport: "+arguments.length);
+if(c){Rico.log("_jsExport: received error="+c);
+this.liveGrid.showMsg(Rico.getPhraseById("requestError",c));
  return
-}this.exportBuffer(c,0);
-this.liveGrid.exportFinish(a)
+}this.exportBuffer(b,0);
+this.liveGrid.exportFinish()
  }};
  if(typeof Rico=="undefined"){throw ("LiveGridForms requires the Rico JavaScript framework")
  }Rico.TableEdit=function(a){this.initialize(a)
author	Matt Brown <dowdybrown@yahoo.com>
	Wed, 18 May 2011 13:52:08 +0000 (13:52 +0000)
committer	Matt Brown <dowdybrown@yahoo.com>
	Wed, 18 May 2011 13:52:08 +0000 (13:52 +0000)
bin/Rico.dll		patch \| blob \| history
examples/asp/3grids.asp	[new file with mode: 0644]	patch \| blob
examples/asp/menu.html		patch \| blob \| history
examples/data/Readme.txt		patch \| blob \| history
examples/dotnet/3grids.aspx	[new file with mode: 0644]	patch \| blob
examples/dotnet/CustTree.aspx		patch \| blob \| history
examples/dotnet/RicoDbViewerDetail.aspx		patch \| blob \| history
examples/dotnet/ShipperEdit.aspx		patch \| blob \| history
examples/dotnet/dbConnect.ascx		patch \| blob \| history
examples/dotnet/employees.aspx		patch \| blob \| history
examples/dotnet/ex1.aspx		patch \| blob \| history
examples/dotnet/ex2editfilter.aspx		patch \| blob \| history
examples/dotnet/ex2json.aspx		patch \| blob \| history
examples/dotnet/ex2nosession.aspx		patch \| blob \| history
examples/dotnet/ex2xml.aspx		patch \| blob \| history
examples/dotnet/menu.aspx		patch \| blob \| history
examples/dotnet/photos.aspx		patch \| blob \| history
examples/dotnet/ricoQuery.aspx	[deleted file]	patch \| blob \| history
examples/dotnet/widgets.aspx		patch \| blob \| history
minsrc/ricoGridCommon.js		patch \| blob \| history
minsrc/ricoLiveGrid.js		patch \| blob \| history
minsrc/ricoLiveGridAjax.js		patch \| blob \| history
minsrc/ricoLiveGridMenu.js		patch \| blob \| history
minsrc/ricoSimpleGrid.js		patch \| blob \| history
ricoClient/js/rico2doj.js		patch \| blob \| history
ricoClient/js/ricoThemeroller.js		patch \| blob \| history
ricoClient/js/rico_min.js		patch \| blob \| history