Permalink
Browse files

Merge branch 'master' of github.com:skradel/Zetetic.Ldap

Conflicts:
	Zetetic.Ldap.Pivoter/Zetetic.Ldap.Pivoter.csproj.user
	Zetetic.Ldap/PagingHelper.cs
	Zetetic.Ldap/UpgradeLog.XML
	Zetetic.Ldap/bin/Release/Zetetic.Ldap.dll
	Zetetic.Ldap/bin/Release/Zetetic.Ldap.pdb
	Zetetic.Ldap/obj/Release/Zetetic.Ldap.dll
	Zetetic.Ldap/obj/Release/Zetetic.Ldap.pdb
  • Loading branch information...
2 parents 8b94110 + 795a140 commit 67e160b8d0abc8b089f2f2907239b4582acd5cc0 @skradel committed Aug 5, 2010
Showing with 14 additions and 5 deletions.
  1. +1 −0 .gitignore
  2. BIN Zetetic.Ldap.AdsImportPrep/bin/Release/Zetetic.Ldap.AdsImportPrep.exe
  3. BIN Zetetic.Ldap.AdsImportPrep/bin/Release/Zetetic.Ldap.AdsImportPrep.pdb
  4. BIN Zetetic.Ldap.AdsImportPrep/bin/Release/Zetetic.Ldap.dll
  5. BIN Zetetic.Ldap.AdsImportPrep/bin/Release/Zetetic.Ldap.pdb
  6. BIN Zetetic.Ldap.AdsImportPrep/obj/Release/Zetetic.Ldap.AdsImportPrep.exe
  7. BIN Zetetic.Ldap.AdsImportPrep/obj/Release/Zetetic.Ldap.AdsImportPrep.pdb
  8. BIN Zetetic.Ldap.Pivoter/bin/Release/Zetetic.Ldap.Pivoter.exe
  9. BIN Zetetic.Ldap.Pivoter/bin/Release/Zetetic.Ldap.Pivoter.pdb
  10. BIN Zetetic.Ldap.Pivoter/bin/Release/Zetetic.Ldap.dll
  11. BIN Zetetic.Ldap.Pivoter/bin/Release/Zetetic.Ldap.pdb
  12. BIN Zetetic.Ldap.Pivoter/obj/Release/Zetetic.Ldap.Pivoter.exe
  13. BIN Zetetic.Ldap.Pivoter/obj/Release/Zetetic.Ldap.Pivoter.pdb
  14. BIN Zetetic.Ldap/LdifTests/bin/Release/LdifTests.dll
  15. BIN Zetetic.Ldap/LdifTests/bin/Release/LdifTests.pdb
  16. BIN Zetetic.Ldap/LdifTests/bin/Release/Zetetic.Ldap.dll
  17. BIN Zetetic.Ldap/LdifTests/bin/Release/Zetetic.Ldap.pdb
  18. BIN Zetetic.Ldap/LdifTests/obj/Release/LdifTests.dll
  19. BIN Zetetic.Ldap/LdifTests/obj/Release/LdifTests.pdb
  20. +8 −5 Zetetic.Ldap/PagingHelper.cs
  21. BIN Zetetic.Ldap/SchemaInfoTests/bin/Release/SchemaInfoTests.dll
  22. BIN Zetetic.Ldap/SchemaInfoTests/bin/Release/SchemaInfoTests.pdb
  23. BIN Zetetic.Ldap/SchemaInfoTests/bin/Release/Zetetic.Ldap.dll
  24. BIN Zetetic.Ldap/SchemaInfoTests/bin/Release/Zetetic.Ldap.pdb
  25. BIN Zetetic.Ldap/SchemaInfoTests/obj/Release/SchemaInfoTests.dll
  26. BIN Zetetic.Ldap/SchemaInfoTests/obj/Release/SchemaInfoTests.pdb
  27. +5 −0 Zetetic.Ldap/UpgradeLog.XML
  28. BIN Zetetic.Ldap/bin/Release/Zetetic.Ldap.dll
  29. BIN Zetetic.Ldap/bin/Release/Zetetic.Ldap.pdb
  30. BIN Zetetic.Ldap/obj/Release/Zetetic.Ldap.dll
  31. BIN Zetetic.Ldap/obj/Release/Zetetic.Ldap.pdb
View
@@ -6,4 +6,5 @@ TestResults/*
ResolveAssemblyReference.dll
bin/Debug
obj/Debug
+*.user
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -37,6 +37,8 @@ protected virtual void OnSearchResponse(string key, SearchResponse resp)
protected virtual SearchResponse GetSearchResponse(string key, SearchRequest req)
{
+ logger.Trace("Dispatch search to DSA: {0}", key);
+
var resp = (SearchResponse)this.Connection.SendRequest(req);
this.OnSearchResponse(key, resp);
@@ -90,7 +92,7 @@ public virtual IEnumerable<SearchResultEntry> GetResults()
if (this.SizeLimit > 0)
req.SizeLimit = this.SizeLimit;
- string alist = "";
+ string alist = string.Empty;
if (this.Attrs != null && this.Attrs.Length > 0)
{
alist = string.Join("!", this.Attrs);
@@ -106,7 +108,7 @@ public virtual IEnumerable<SearchResultEntry> GetResults()
while (prc != null && (currentPage++ < this.MaxPages || this.MaxPages < 1))
{
- if (this.PageSize > 0)
+ if (this.PageSize > 0 && (this.PageSize < this.SizeLimit || this.SizeLimit == 0))
{
if (currentPage > 1)
req.Controls.Clear();
@@ -116,11 +118,13 @@ public virtual IEnumerable<SearchResultEntry> GetResults()
else
logger.Trace("Unpaged search");
+
foreach (var dc in this.UserControls)
req.Controls.Add(dc);
- string key = this.DistinguishedName + ":" + this.SearchScope.ToString()
- + ":" + this.Filter + "," + currentPage + "," + this.PageSize + "," + alist;
+ string key = this.DistinguishedName + ";" + this.SearchScope.ToString()
+ + ";f=" + this.Filter + ";cp=" + currentPage + ";psz=" + this.PageSize
+ + ";szl=" + this.SizeLimit + ";att" + alist;
SearchResponse resp;
@@ -158,7 +162,6 @@ public virtual IEnumerable<SearchResultEntry> GetResults()
prc = UpdatePrc(resp);
}
- yield break;
}
#region IDisposable Members
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type='text/xsl' href='_UpgradeReport_Files/UpgradeReport.xslt'?><UpgradeLog>
<Properties><Property Name="Solution" Value="Zetetic.Ldap">
</Property><Property Name="Solution File" Value="C:\zetetic-ldap\Zetetic.Ldap\Zetetic.Ldap.sln">
+<<<<<<< HEAD
</Property><Property Name="Date" Value="Thursday, May 06, 2010">
</Property><Property Name="Time" Value="14:12 PM">
+=======
+</Property><Property Name="Date" Value="Thursday, July 22, 2010">
+</Property><Property Name="Time" Value="0:52 AM">
+>>>>>>> 795a14038cdeec4834b253630bbdf7e1f35dbe77
</Property></Properties><Event ErrorLevel="1" Project="Zetetic.Ldap" Source="Zetetic.Ldap.csproj" Description="Your project is targeting .NET Framework 2.0 or 3.0. If your project uses assemblies requiring a newer .NET Framework, your project will fail to build. You can change the .NET Framework version by clicking Properties on the project menu and then selecting a new version in the '.NET Framework' dropdown box. (In Visual Basic, this is located on the Compile tab by clicking the 'Advanced Compiler Options...' button.)">
</Event><Event ErrorLevel="0" Project="Zetetic.Ldap" Source="Zetetic.Ldap.csproj" Description="Project converted successfully">
</Event><Event ErrorLevel="3" Project="Zetetic.Ldap" Source="Zetetic.Ldap.csproj" Description="Converted">
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 67e160b

Please sign in to comment.