Skip to content

Commit 4820875

Browse files
JocaPCJocaPC
committed
Removed some dead code in IVS example
1 parent 3fbdc14 commit 4820875

File tree

1 file changed

+1
-172
lines changed

1 file changed

+1
-172
lines changed

‎samples/demos/ivs-people-register/Controllers/ODataController.cs‎

Lines changed: 1 addition & 172 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public class ODataController : Controller
1919
.AddColumn("address", "nvarchar")
2020
.AddColumn("town", "nvarchar");
2121

22-
2322
public string ODataMetadataUrl
2423
{
2524
get
@@ -37,26 +36,15 @@ public ODataController(IQueryPipe sqlQueryService)
3736
[HttpGet]
3837
public string Get()
3938
{
40-
try
41-
{
42-
return ODataHandler.GetRootMetadataJsonV4(ODataMetadataUrl, new TableSpec[] { tableSpec });
43-
} catch (Exception ex)
44-
{
45-
return ex.Message;
46-
}
39+
return ODataHandler.GetRootMetadataJsonV4(ODataMetadataUrl, new TableSpec[] { tableSpec });
4740
}
4841

4942

5043
[Produces("application/xml")]
5144
[HttpGet("$metadata")]
5245
public string Metadata()
5346
{
54-
try {
5547
return ODataHandler.GetMetadataXmlV4(new TableSpec[] { tableSpec }, "Demo.Models");
56-
} catch (Exception ex)
57-
{
58-
return ex.Message;
59-
}
6048
}
6149

6250
// GET api/odata/People
@@ -75,164 +63,5 @@ public Task PeopleCount()
7563
{
7664
return this.People();
7765
}
78-
79-
/// <summary>
80-
/// Endpoint that exposes People information using OData protocol.
81-
/// </summary>
82-
/// <returns>OData response.</returns>
83-
// GET api/OData/People
84-
[HttpGet("Product")]
85-
public async Task OData()
86-
{
87-
Response.ContentType = "application/json;odata.metadata=minimal;odata=minimalmetadata";
88-
//var body = Encoding.UTF8.GetBytes(@"{""@odata.context"":""http://localhost:59934/api/odata/$metadata#Product"",""value"":[{""id"":1,""name"":""Test""}]}");
89-
90-
//await Response.Body.WriteAsync(body, 0, body.Length);
91-
92-
await this
93-
.ODataHandler(tableSpec, pipe)
94-
.Get();
95-
}
96-
97-
98-
99-
/// <summary>
100-
/// Method that process server-side processing JQuery DataTables HTTP request
101-
/// and returns data that should be shown.
102-
/// </summary>
103-
/// <returns></returns>
104-
// GET api/People
105-
//[HttpGet]
106-
public string GetOld()
107-
{
108-
//Response.ContentType = "application/json;odata=minimalmetadata;streaming=true;charset=utf-8";
109-
110-
//return "{\"odata.metadata\":\"http://services.odata.org/V3/Northwind/Northwind.svc/$metadata\",\"value\":[{\"name\":\"People\",\"url\":\"People\"}]}";
111-
//Response.ContentType = "application/json;odata=nometadata;streaming=true;charset=utf-8";
112-
//return "{\"odata.metadata\":\"http://services.odata.org/V3/Northwind/Northwind.svc/$metadata\",\"value\":[{\"name\":\"People\",\"url\":\"People\"}]}";
113-
114-
// radi:
115-
//Response.ContentType = "application/xml;charset=utf-8";
116-
//return @"<?xml version=""1.0"" encoding=""utf-8""?><service xml:base=""http://services.odata.org/V3/Northwind/Northwind.svc/"" xmlns=""http://www.w3.org/2007/app"" xmlns:atom=""http://www.w3.org/2005/Atom""><workspace><atom:title>Default</atom:title><collection href=""Categories""><atom:title>Categories</atom:title></collection><collection href=""CustomerDemographics""><atom:title>CustomerDemographics</atom:title></collection><collection href=""Customers""><atom:title>Customers</atom:title></collection><collection href=""Employees""><atom:title>Employees</atom:title></collection><collection href=""Order_Details""><atom:title>Order_Details</atom:title></collection><collection href=""Orders""><atom:title>Orders</atom:title></collection><collection href=""Products""><atom:title>Products</atom:title></collection><collection href=""Regions""><atom:title>Regions</atom:title></collection><collection href=""Shippers""><atom:title>Shippers</atom:title></collection><collection href=""Suppliers""><atom:title>Suppliers</atom:title></collection><collection href=""Territories""><atom:title>Territories</atom:title></collection><collection href=""Alphabetical_list_of_products""><atom:title>Alphabetical_list_of_products</atom:title></collection><collection href=""Category_Sales_for_1997""><atom:title>Category_Sales_for_1997</atom:title></collection><collection href=""Current_Product_Lists""><atom:title>Current_Product_Lists</atom:title></collection><collection href=""Customer_and_Suppliers_by_Cities""><atom:title>Customer_and_Suppliers_by_Cities</atom:title></collection><collection href=""Invoices""><atom:title>Invoices</atom:title></collection><collection href=""Order_Details_Extendeds""><atom:title>Order_Details_Extendeds</atom:title></collection><collection href=""Order_Subtotals""><atom:title>Order_Subtotals</atom:title></collection><collection href=""Orders_Qries""><atom:title>Orders_Qries</atom:title></collection><collection href=""Product_Sales_for_1997""><atom:title>Product_Sales_for_1997</atom:title></collection><collection href=""Products_Above_Average_Prices""><atom:title>Products_Above_Average_Prices</atom:title></collection><collection href=""Products_by_Categories""><atom:title>Products_by_Categories</atom:title></collection><collection href=""Sales_by_Categories""><atom:title>Sales_by_Categories</atom:title></collection><collection href=""Sales_Totals_by_Amounts""><atom:title>Sales_Totals_by_Amounts</atom:title></collection><collection href=""Summary_of_Sales_by_Quarters""><atom:title>Summary_of_Sales_by_Quarters</atom:title></collection><collection href=""Summary_of_Sales_by_Years""><atom:title>Summary_of_Sales_by_Years</atom:title></collection></workspace></service>";
117-
118-
Response.ContentType = "application/xml;charset=utf-8";
119-
return @"<?xml version=""1.0"" encoding=""utf-8""?><service xml:base=""http://localhost:59934/api/odata"" xmlns=""http://www.w3.org/2007/app"" xmlns:atom=""http://www.w3.org/2005/Atom""><workspace><atom:title>Default</atom:title><collection href=""Product""><atom:title>Product</atom:title></collection></workspace></service>";
120-
}
121-
122-
//[HttpGet("$metadata")]
123-
//public string Metadata1()
124-
//{
125-
// Response.ContentType = "application/xml;charset=utf-8";
126-
127-
// return ODataMetaData(this.tableSpec, "Models", "Product");
128-
129-
//}
130-
131-
132-
[HttpGet("$metadata2")]
133-
public string Metadata2()
134-
{
135-
//Response.ContentType = "application/json;odata=minimalmetadata;streaming=true;charset=utf-8";
136-
137-
//return "{\"odata.metadata\":\"http://services.odata.org/V3/Northwind/Northwind.svc/$metadata\",\"value\":[{\"name\":\"People\",\"url\":\"People\"}]}";
138-
//Response.ContentType = "application/json;odata=minimalmetadata;streaming=true;charset=utf-8";
139-
//return "{\"odata.metadata\":\"http://services.odata.org/V3/Northwind/Northwind.svc/$metadata\",\"value\":[{\"name\":\"Categories\",\"url\":\"Categories\"}]}";
140-
Response.ContentType = "application/xml;charset=utf-8";
141-
142-
//var wc = new System.Net.WebRequest();
143-
144-
145-
return @"<?xml version=""1.0"" encoding=""utf-8""?>
146-
<edmx:Edmx Version=""4.0"" xmlns:edmx=""http://docs.oasis-open.org/odata/ns/edmx"">
147-
<edmx:DataServices>
148-
<Schema Namespace=""Models"" xmlns=""http://docs.oasis-open.org/odata/ns/edm"">
149-
<EntityType Name=""Product"">
150-
<Key>
151-
<PropertyRef Name=""id""/>
152-
</Key>
153-
<Property Name=""id"" Type=""Edm.Int32""/>
154-
<Property Name=""name"" Type=""Edm.String"" />
155-
</EntityType>
156-
</Schema>
157-
<Schema Namespace=""ODataDemo"" xmlns=""http://docs.oasis-open.org/odata/ns/edm"">
158-
<EntityContainer Name=""DefaultContainer"">
159-
<EntitySet Name=""Product"" EntityType=""Models.Product"" />
160-
</EntityContainer>
161-
</Schema>
162-
</edmx:DataServices>
163-
</edmx:Edmx>";
164-
}
165-
166-
167-
private string SqlTypeToDemType(string sqlType)
168-
{
169-
switch (sqlType)
170-
{
171-
case "bigint": return "Edm.Int64";
172-
case "binary": return "Edm.Byte[]";
173-
case "bit": return "Edm.Boolean";
174-
case "char": return "Edm.String";
175-
case "date": return "Edm.DateTime";
176-
case "datetime": return "Edm.DateTime";
177-
case "datetime2": return "Edm.DateTime";
178-
case "datetimeoffset": return "Edm.DateTimeOffset";
179-
case "decimal": return "Edm.Decimal";
180-
case "float": return "Edm.Double";
181-
case "image": return "Edm.Byte[]";
182-
case "int": return "Edm.Int32";
183-
case "money": return "Edm.Decimal";
184-
case "nchar": return "Edm.String";
185-
case "ntext": return "Edm.String";
186-
case "numeric": return "Edm.Decimal";
187-
case "nvarchar": return "Edm.String";
188-
case "real": return "Edm.Single";
189-
case "rowversion": return "Edm.Byte[]";
190-
case "smalldatetime": return "Edm.DateTime";
191-
case "smallint": return "Edm.Int16";
192-
case "smallmoney": return "Edm.Decimal";
193-
case "sql_variant": return "Edm.Object";
194-
case "text": return "Edm.String";
195-
case "time": return "Edm.TimeSpan";
196-
case "timestamp": return "Edm.Byte[]";
197-
case "tinyint": return "Edm.Byte";
198-
case "uniqueidentifier": return "Edm.Guid";
199-
case "varbinary": return "Edm.Byte[]";
200-
case "varchar": return "Edm.String";
201-
case "xml": return "Edm.Xml";
202-
default: throw new ArgumentException("Unsupported type", "sqlType");
203-
}
204-
}
205-
206-
private string ODataMetaData(TableSpec spec, string Namespace, string EntityName)
207-
{
208-
var metadata = new StringBuilder();
209-
metadata
210-
.AppendFormat(@"<?xml version=""1.0"" encoding=""utf-8""?>
211-
<edmx:Edmx Version=""4.0"" xmlns:edmx=""http://docs.oasis-open.org/odata/ns/edmx"">
212-
<edmx:DataServices>
213-
<Schema Namespace=""{0}"" xmlns=""http://docs.oasis-open.org/odata/ns/edm"">", Namespace)
214-
.AppendFormat(@"<EntityType Name=""{0}"">", EntityName);
215-
for(int i = 0; i< spec.columns.Count; i++)
216-
{
217-
if(i == 0)
218-
metadata.AppendFormat(@"<Key><PropertyRef Name=""{0}""/></Key>", spec.columns[0]);
219-
metadata.AppendFormat(@"<Property Name=""{0}"" Type=""{1}""/>", spec.columns[i], "Edm.Int32");
220-
}
221-
222-
metadata
223-
.AppendFormat(@"</EntityType>")
224-
//.Append("</Schema>")
225-
//.AppendFormat(@"<Schema Namespace=""{0}"" xmlns=""http://docs.oasis-open.org/odata/ns/edm"">")
226-
.AppendFormat(@"
227-
<EntityContainer Name=""{0}"">
228-
<EntitySet Name=""{1}"" EntityType=""{2}"" />
229-
</EntityContainer>
230-
</Schema>", "DefaultContainer", EntityName, "Models.Product")
231-
.AppendFormat(@"
232-
</edmx:DataServices>
233-
</edmx:Edmx>");
234-
235-
return metadata.ToString();
236-
}
23766
}
23867
}

0 commit comments

Comments
 (0)